Added glib >= 2.43.1 compatibility patch.
This commit is contained in:
53
debian/patches/0004_glib_connect_first.patch
vendored
Normal file
53
debian/patches/0004_glib_connect_first.patch
vendored
Normal file
@ -0,0 +1,53 @@
|
||||
From 0376255e93e11d06e368d468de7c1c804e4b4c9c Mon Sep 17 00:00:00 2001
|
||||
From: Monsta <monsta@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);
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -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
|
||||
|
Reference in New Issue
Block a user