[mate-session-manager] 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-session-manager.

commit 2d99f7db0a2e6dbcbd8cd4e968d6ca2164d45966
Author: Martin Wimpress <code at flexion.org>
Date:   Fri Feb 27 11:40:34 2015 +0000

    Added glib >= 2.43.1 compatibility patch.
---
 debian/patches/0004_glib_connect_first.patch | 53 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 54 insertions(+)

diff --git a/debian/patches/0004_glib_connect_first.patch b/debian/patches/0004_glib_connect_first.patch
new file mode 100644
index 0000000..c70c037
--- /dev/null
+++ b/debian/patches/0004_glib_connect_first.patch
@@ -0,0 +1,53 @@
+From 0376255e93e11d06e368d468de7c1c804e4b4c9c Mon Sep 17 00:00:00 2001
+From: Monsta <monsta at inbox.ru>
+Date: Thu, 19 Feb 2015 17:36:25 +0300
+Subject: [PATCH] first connect to settings, then read them.
+
+fixes the issue with GLib >= 2.43,
+https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
+---
+ capplet/gsm-properties-dialog.c  | 5 +++--
+ mate-session/gsm-autostart-app.c | 3 ++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
+index c920882..694690a 100644
+--- a/capplet/gsm-properties-dialog.c
++++ b/capplet/gsm-properties-dialog.c
+@@ -671,13 +671,14 @@ setup_dialog (GsmPropertiesDialog *dialog)
+         button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml,
+                                                      CAPPLET_REMEMBER_WIDGET_NAME));
+         dialog->priv->remember_toggle = button;
+-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+-                                      g_settings_get_boolean (dialog->priv->settings, SPC_AUTOSAVE_KEY));
++
+         g_signal_connect (dialog->priv->settings,
+                           "changed::" SPC_AUTOSAVE_KEY,
+                           G_CALLBACK (on_autosave_value_notify),
+                           dialog);
+ 
++        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
++                                      g_settings_get_boolean (dialog->priv->settings, SPC_AUTOSAVE_KEY));
+         g_signal_connect (button,
+                           "toggled",
+                           G_CALLBACK (on_autosave_value_toggled),
+diff --git a/mate-session/gsm-autostart-app.c b/mate-session/gsm-autostart-app.c
+index 04cc8e6..37c2228 100644
+--- a/mate-session/gsm-autostart-app.c
++++ b/mate-session/gsm-autostart-app.c
+@@ -307,13 +307,14 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
+                 return FALSE;
+ 
+         settings = g_settings_new (elems[0]);
+-        retval = g_settings_get_boolean (settings, elems[1]);
+ 
+         signal = g_strdup_printf ("changed::%s", elems[1]);
+         g_signal_connect (G_OBJECT (settings), signal,
+                           G_CALLBACK (gsettings_condition_cb), app);
+         g_free (signal);
+ 
++        retval = g_settings_get_boolean (settings, elems[1]);
++
+         app->priv->condition_settings = settings;
+ 
+         g_strfreev (elems);
diff --git a/debian/patches/series b/debian/patches/series
index 5458d83..36f863d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
 0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
 0003_set-XDG-CURRENT-DESKTOP-if-empty.patch
+0004_glib_connect_first.patch
 1001_hypen-used-as-minus-sign-man-page-fix.patch

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