[marco] 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 marco.

commit c28be3190622e801aec8af89154ec4159cc7c8ad
Author: Martin Wimpress <code at flexion.org>
Date:   Fri Feb 27 10:45:10 2015 +0000

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

diff --git a/debian/patches/0006_glib_connect_first.patch b/debian/patches/0006_glib_connect_first.patch
new file mode 100644
index 0000000..490b262
--- /dev/null
+++ b/debian/patches/0006_glib_connect_first.patch
@@ -0,0 +1,43 @@
+From f56a1ba0abceaba79efa55120a9e706768809cb4 Mon Sep 17 00:00:00 2001
+From: Monsta <monsta at inbox.ru>
+Date: Wed, 18 Feb 2015 15:49:09 +0300
+Subject: [PATCH] prefs: first connect to settings, then read them.
+
+fixes the issue with GLib >= 2.43,
+https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
+---
+ src/core/prefs.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/prefs.c b/src/core/prefs.c
+index 5f46b55..7f747a2 100644
+--- a/src/core/prefs.c
++++ b/src/core/prefs.c
+@@ -888,13 +888,6 @@ meta_prefs_init (void)
+   g_hash_table_insert (settings_schemas, KEY_MATE_TERMINAL_SCHEMA, settings_mate_terminal);
+   g_hash_table_insert (settings_schemas, KEY_MATE_MOUSE_SCHEMA, settings_mate_mouse);
+ 
+-  /* Pick up initial values. */
+-
+-  handle_preference_init_enum ();
+-  handle_preference_init_bool ();
+-  handle_preference_init_string ();
+-  handle_preference_init_int ();
+-
+   g_signal_connect (settings_general, "changed", G_CALLBACK (change_notify), NULL);
+   g_signal_connect (settings_command, "changed", G_CALLBACK (change_notify), NULL);
+   g_signal_connect (settings_screen_bindings, "changed", G_CALLBACK (change_notify), NULL);
+@@ -907,6 +900,13 @@ meta_prefs_init (void)
+   g_signal_connect (settings_mate_mouse, "changed::" KEY_MATE_MOUSE_CURSOR_THEME, G_CALLBACK (change_notify), NULL);
+   g_signal_connect (settings_mate_mouse, "changed::" KEY_MATE_MOUSE_CURSOR_SIZE, G_CALLBACK (change_notify), NULL);
+ 
++  /* Pick up initial values. */
++
++  handle_preference_init_enum ();
++  handle_preference_init_bool ();
++  handle_preference_init_string ();
++  handle_preference_init_int ();
++
+   init_bindings ();
+   init_commands ();
+   init_workspace_names ();
diff --git a/debian/patches/series b/debian/patches/series
index c72da71..6e88566 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@
 0003_no-shadows-to-ARGB-windows.patch
 0004_dont-switch-workspace-when-switching-to-sticky-window.patch
 0005_fix-resizing-csd-windows.patch
+0006_glib_connect_first.patch
 2001_omit-gfdl-licensed-theme-documentation.patch

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