From 7e6d4ef02b5d8d7ae8c9dcc27a37e9f844b09b90 Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Sat, 15 Dec 2012 02:57:08 +0200
Subject: [plugins] only link background/xrandr to mate-desktop, not main
 process

Most of the plugins do not need gnome-desktop's functionality, so there is
no point in the main process linking against it.

http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=ed54ceee46b6a56613c8aeb3d594f6a485400ef9
---
 plugins/xrandr/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/xrandr')

diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index 1a398d7..6bdfaae 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -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
-- 
cgit v1.2.1


From 8bcea2de19cab57e0c340cf6d8ebf181c31529df Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Sat, 15 Dec 2012 03:09:58 +0200
Subject: [all] Silence build by default, and remove unneeded version
 requirements

http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=b9b785508085d77818c76ab4aed8ee574dbd1756
---
 plugins/xrandr/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/xrandr')

diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index 6bdfaae..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)
 
-- 
cgit v1.2.1


From 5129b9008a6700294bcd8d8f0fcaee4bef2932fc Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Sat, 15 Dec 2012 05:40:43 +0200
Subject: [plugins] various small fixes/improvements

In plugins/housekeeping/gsd-ldsm-dialog.c
- Initialize GSList ignore_paths before use
- Use g_slist_prepend instead of _append in loop (more efficient), reverse after

In plugins/media-keys/msd-media-keys-manager.c
- Default to mate-terminal if terminal "exec" key is empty

In plugins/xrandr/msd-xrandr-manager.c
- Only start_or_stop_icon when the show icon key actually changes

Also, adapt this for media-keys plugin:
Don't use org.gnome.settings-daemon for volume_step setting
http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=1a9eea8224d41643a8a7a05d799198058e36e1a8
---
 plugins/xrandr/msd-xrandr-manager.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins/xrandr')

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
-- 
cgit v1.2.1