[mate-settings-daemon] 01/01: Added glib >= 2.43.1 compatibility patch.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository mate-settings-daemon.

commit bf7856b710d9dbdf8298f693ead72b3111f73ce7
Author: Martin Wimpress <code at flexion.org>
Date:   Fri Feb 27 11:41:28 2015 +0000

    Added glib >= 2.43.1 compatibility patch.
---
 debian/patches/0014_glib_connect_first.patch | 43 ++++++++++++++++++++++++++++
 debian/patches/series                        |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0014_glib_connect_first.patch b/debian/patches/0014_glib_connect_first.patch
new file mode 100644
index 0000000..62e9c59
--- /dev/null
+++ b/debian/patches/0014_glib_connect_first.patch
@@ -0,0 +1,43 @@
+From ba8249e03455af1b867298d9d5c868607ab32cdc Mon Sep 17 00:00:00 2001
+From: Monsta <monsta at inbox.ru>
+Date: Wed, 18 Feb 2015 18:09:18 +0300
+Subject: [PATCH] xsettings plugin: first connect to settings, then read them.
+
+fixes the issue with GLib >= 2.43,
+https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
+---
+ plugins/xsettings/msd-xsettings-manager.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c
+index 1bf7de4..a8ccbc9 100644
+--- a/plugins/xsettings/msd-xsettings-manager.c
++++ b/plugins/xsettings/msd-xsettings-manager.c
+@@ -683,6 +683,13 @@ mate_xsettings_manager_start (MateXSettingsManager *manager,
+         g_hash_table_insert (manager->priv->gsettings,
+                              SOUND_SCHEMA, g_settings_new (SOUND_SCHEMA));
+ 
++        list = g_hash_table_get_values (manager->priv->gsettings);
++        for (l = list; l != NULL; l = l->next) {
++                g_signal_connect_object (G_OBJECT (l->data), "changed",
++                			 G_CALLBACK (xsettings_callback), manager, 0);
++        }
++        g_list_free (list);
++
+         for (i = 0; i < G_N_ELEMENTS (translations); i++) {
+                 GVariant  *val;
+                 GSettings *gsettings;
+@@ -701,13 +708,6 @@ mate_xsettings_manager_start (MateXSettingsManager *manager,
+                 g_variant_unref (val);
+         }
+ 
+-        list = g_hash_table_get_values (manager->priv->gsettings);
+-        for (l = list; l != NULL; l = l->next) {
+-                g_signal_connect_object (G_OBJECT (l->data), "changed",
+-                			 G_CALLBACK (xsettings_callback), manager, 0);
+-        }
+-        g_list_free (list);
+-
+ #ifdef HAVE_FONTCONFIG
+         manager->priv->gsettings_font = g_settings_new (FONT_RENDER_SCHEMA);
+         g_signal_connect (manager->priv->gsettings_font, "changed", G_CALLBACK (xft_callback), manager);
diff --git a/debian/patches/series b/debian/patches/series
index 3e0ffbc..093c739 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 0011_add_a11y_settings_plugin.patch
 0012_use_gnome_a11y_schema_to_enable_applications.patch
 0013_monitor_gnome_schema_keys.patch
-
+0014_glib_connect_first.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-settings-daemon.git