diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-15 12:33:17 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-15 12:33:17 -0800 |
| commit | 85c5ae14d75e3413b8f3f3aa38205ea852dcb20d (patch) | |
| tree | 4750b8d23dfcb17aea6cbc62c7e1c788a6976a7b /plugins/xrandr | |
| parent | 12dcf19aa5f51901053c273cd7f5c17ce85e909d (diff) | |
| parent | c6a6cbde72489a0055ba63341a153fe365058072 (diff) | |
| download | mate-settings-daemon-85c5ae14d75e3413b8f3f3aa38205ea852dcb20d.tar.bz2 mate-settings-daemon-85c5ae14d75e3413b8f3f3aa38205ea852dcb20d.tar.xz | |
Merge pull request #31 from jasmineaura/develop
background revised, various other fixes & improvements
Diffstat (limited to 'plugins/xrandr')
| -rw-r--r-- | plugins/xrandr/Makefile.am | 6 | ||||
| -rw-r--r-- | plugins/xrandr/msd-xrandr-manager.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am index 1a398d7..b4afb93 100644 --- a/plugins/xrandr/Makefile.am +++ b/plugins/xrandr/Makefile.am @@ -35,7 +35,7 @@ plugin_LTLIBRARIES = \ libxrandr.la msd-xrandr-manager-glue.h: msd-xrandr-manager.xml Makefile - dbus-binding-tool --prefix=msd_xrandr_manager --mode=glib-server $< > xgen-$(@F) \ + $(AM_V_GEN) dbus-binding-tool --prefix=msd_xrandr_manager --mode=glib-server $< > xgen-$(@F) \ && ( cmp -s xgen-$(@F) $@ || cp xgen-$(@F) $@ ) \ && rm -f xgen-$(@F) @@ -55,6 +55,7 @@ libxrandr_la_CPPFLAGS = \ libxrandr_la_CFLAGS = \ $(SETTINGS_PLUGIN_CFLAGS) \ $(LIBMATENOTIFY_CFLAGS) \ + $(MATE_DESKTOP_CFLAGS) \ $(AM_CFLAGS) libxrandr_la_LDFLAGS = \ @@ -62,7 +63,8 @@ libxrandr_la_LDFLAGS = \ libxrandr_la_LIBADD = \ $(SETTINGS_PLUGIN_LIBS) \ - $(LIBMATENOTIFY_LIBS) + $(LIBMATENOTIFY_LIBS) \ + $(MATE_DESKTOP_LIBS) plugin_in_files = \ xrandr.mate-settings-plugin.in diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index 7c6a046..c56cd51 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -2156,7 +2156,8 @@ on_config_changed (GSettings *settings, gchar *key, MsdXrandrManager *manager) { - start_or_stop_icon (manager); + if (g_strcmp0 (key, CONF_KEY_SHOW_NOTIFICATION_ICON) == 0) + start_or_stop_icon (manager); } static gboolean |