From 4e4971719bc0f49c07905cab802b861281562edc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 30 May 2017 11:56:07 +0200 Subject: src/utils.[ch]: Make desktop env checks available globally, load MSD media keys settings, if in MATE environment. --- src/backend-dbus/actions.c | 65 ++-------------------------------------------- src/backend-dbus/actions.h | 1 - 2 files changed, 2 insertions(+), 64 deletions(-) (limited to 'src/backend-dbus') diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index 3965865..33305d9 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -29,6 +29,8 @@ #include "actions.h" +#include "../utils.h" + enum { END_SESSION_TYPE_LOGOUT = 0, @@ -81,69 +83,6 @@ log_and_clear_error (GError ** err, const char * loc, const char * func) } } -static gboolean -is_unity () -{ - const gchar *xdg_current_desktop; - gchar **desktop_names; - int i; - - xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP"); - if (xdg_current_desktop != NULL) { - desktop_names = g_strsplit (xdg_current_desktop, ":", 0); - for (i = 0; desktop_names[i]; ++i) { - if (!g_strcmp0 (desktop_names[i], "Unity")) { - g_strfreev (desktop_names); - return TRUE; - } - } - g_strfreev (desktop_names); - } - return FALSE; -} - -static gboolean -is_gnome () -{ - const gchar *xdg_current_desktop; - gchar **desktop_names; - int i; - - xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP"); - if (xdg_current_desktop != NULL) { - desktop_names = g_strsplit (xdg_current_desktop, ":", 0); - for (i = 0; desktop_names[i]; ++i) { - if (!g_strcmp0 (desktop_names[i], "GNOME")) { - g_strfreev (desktop_names); - return TRUE; - } - } - g_strfreev (desktop_names); - } - return FALSE; -} - -static gboolean -is_mate () -{ - const gchar *xdg_current_desktop; - gchar **desktop_names; - int i; - - xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP"); - if (xdg_current_desktop != NULL) { - desktop_names = g_strsplit (xdg_current_desktop, ":", 0); - for (i = 0; desktop_names[i]; ++i) { - if (!g_strcmp0 (desktop_names[i], "MATE")) { - g_strfreev (desktop_names); - return TRUE; - } - } - g_strfreev (desktop_names); - } - return FALSE; -} - /*** **** diff --git a/src/backend-dbus/actions.h b/src/backend-dbus/actions.h index d3d722d..97d816a 100644 --- a/src/backend-dbus/actions.h +++ b/src/backend-dbus/actions.h @@ -64,7 +64,6 @@ void indicator_session_actions_dbus_set_proxies (IndicatorSessionActionsDbus * s Login1Manager * login1_manager, Login1Seat * login1_seat, DisplayManagerSeat * dm_seat); - G_END_DECLS -- cgit v1.2.3