[marco] 01/03: Revert "Added glib >= 2.43.1 compatibility patch."

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository marco.

commit 892c93b27fac9e2e624211fb8ed40d69f2718b2c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 9 05:50:28 2015 +0100

    Revert "Added glib >= 2.43.1 compatibility patch."
    
    This reverts commit c28be3190622e801aec8af89154ec4159cc7c8ad.
---
 debian/patches/0006_glib_connect_first.patch | 43 ----------------------------
 debian/patches/series                        |  1 -
 2 files changed, 44 deletions(-)

diff --git a/debian/patches/0006_glib_connect_first.patch b/debian/patches/0006_glib_connect_first.patch
deleted file mode 100644
index 490b262..0000000
--- a/debian/patches/0006_glib_connect_first.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 6e88566..c72da71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
 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