[mate-desktop] 01/04: 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 mate-desktop.

commit 336d9e5c58ad5c94fb5b501ceac82214ce873c1f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Mar 28 14:34:29 2015 +0100

    Revert "Added glib >= 2.43.1 compatibility patch."
    
    This reverts commit 9ea165cd54ff64cc5c5814195372e6c2756b93cc.
---
 debian/patches/0001_glib_connect_first.patch | 38 ----------------------------
 debian/patches/series                        |  1 -
 2 files changed, 39 deletions(-)

diff --git a/debian/patches/0001_glib_connect_first.patch b/debian/patches/0001_glib_connect_first.patch
deleted file mode 100644
index 34a6e7f..0000000
--- a/debian/patches/0001_glib_connect_first.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 09afa9052073839e91b065f6e19b692270f7307a Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Mon, 2 Mar 2015 16:57:42 +0300
-Subject: [PATCH] mate-thumbnail: first connect to settings, then read them.
-
-fixes the issue with GLib >= 2.43,
-https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
----
- libmate-desktop/mate-desktop-thumbnail.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
-index 734334b..37de54e 100644
---- a/libmate-desktop/mate-desktop-thumbnail.c
-+++ b/libmate-desktop/mate-desktop-thumbnail.c
-@@ -840,9 +840,7 @@ mate_desktop_thumbnail_factory_init (MateDesktopThumbnailFactory *factory)
- #endif
- 
-   priv->settings = g_settings_new ("org.mate.thumbnailers");
--  priv->disabled = g_settings_get_boolean (priv->settings, "disable-all");
--  if (!priv->disabled)
--    priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
-+
-   g_signal_connect (priv->settings, "changed::disable-all",
-                     G_CALLBACK (external_thumbnailers_disabled_all_changed_cb),
-                     factory);
-@@ -850,6 +848,11 @@ mate_desktop_thumbnail_factory_init (MateDesktopThumbnailFactory *factory)
-                     G_CALLBACK (external_thumbnailers_disabled_changed_cb),
-                     factory);
- 
-+  priv->disabled = g_settings_get_boolean (priv->settings, "disable-all");
-+
-+  if (!priv->disabled)
-+    priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
-+
-   if (!priv->disabled)
-     mate_desktop_thumbnail_factory_load_thumbnailers (factory);
- }
diff --git a/debian/patches/series b/debian/patches/series
index f68292d..c97dc73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001_glib_connect_first.patch
 2001_omit-gfdl-licensed-user-guide.patch

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