aboutsummaryrefslogtreecommitdiff
path: root/src/backend-dbus/actions.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-30 11:56:07 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-05-30 11:59:27 +0200
commit4e4971719bc0f49c07905cab802b861281562edc (patch)
tree2f7e6b031474221ad75efe5adee20109ce40fd7c /src/backend-dbus/actions.c
parent2eb2c1eeecf1d79e45e1007f7487f2675850b9f1 (diff)
downloadayatana-indicator-session-4e4971719bc0f49c07905cab802b861281562edc.tar.gz
ayatana-indicator-session-4e4971719bc0f49c07905cab802b861281562edc.tar.bz2
ayatana-indicator-session-4e4971719bc0f49c07905cab802b861281562edc.zip
src/utils.[ch]: Make desktop env checks available globally, load MSD media keys settings, if in MATE environment.
Diffstat (limited to 'src/backend-dbus/actions.c')
-rw-r--r--src/backend-dbus/actions.c65
1 files changed, 2 insertions, 63 deletions
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;
-}
-
/***
****