aboutsummaryrefslogtreecommitdiff
path: root/src/service.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/service.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/service.c')
-rw-r--r--src/service.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/service.c b/src/service.c
index 46c3c19..401bc56 100644
--- a/src/service.c
+++ b/src/service.c
@@ -24,6 +24,8 @@
#include "recoverable-problem.h"
#include "service.h"
+#include "utils.h"
+
#define BUS_NAME "org.ayatana.indicator.session"
#define BUS_PATH "/org/ayatana/indicator/session"
@@ -1235,7 +1237,12 @@ indicator_session_service_init (IndicatorSessionService * self)
INDICATOR_TYPE_SESSION_SERVICE,
IndicatorSessionServicePrivate);
p->indicator_settings = g_settings_new ("org.ayatana.indicator.session");
- p->keybinding_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");
+ if (is_mate())
+ p->keybinding_settings = g_settings_new ("org.mate.SettingsDaemon.plugins.media-keys");
+
+ else if (is_gnome() || is_unity())
+ p->keybinding_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");
+
self->priv = p;
/* init the backend objects */