raveit65 pushed to mate-desktop (f22). "remove upstreamed patches"

[notifications at fedoraproject.org]

>From e4754b05c83e5272ead70e66b76dafe0f3c6e6e4 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Mon, 6 Apr 2015 01:39:07 +0200
Subject: remove upstreamed patches


diff --git a/mate-desktop_fix-glib-2.43.patch b/mate-desktop_fix-glib-2.43.patch
deleted file mode 100644
index 6958396..0000000
--- a/mate-desktop_fix-glib-2.43.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b10f5922f62c3936c4a7c7d809dda6f8497a926a Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Mon, 02 Mar 2015 13:57:42 +0000
-Subject: 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
-
-Closes https://github.com/mate-desktop/mate-desktop/pull/162
----
-diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
-index 4a4e5d6..02bcaf2 100644
---- a/libmate-desktop/mate-desktop-thumbnail.c
-+++ b/libmate-desktop/mate-desktop-thumbnail.c
-@@ -790,9 +790,7 @@ mate_desktop_thumbnail_factory_init (MateDesktopThumbnailFactory *factory)
-   g_mutex_init (&priv->lock);
- 
-   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);
-@@ -800,6 +798,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);
- }
---
-cgit 
-
diff --git a/mate-desktop_fix-pkexec-wth-m_c_c.patch b/mate-desktop_fix-pkexec-wth-m_c_c.patch
deleted file mode 100644
index 6d29449..0000000
--- a/mate-desktop_fix-pkexec-wth-m_c_c.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/libmate-desktop/mate-desktop-item.c b/libmate-desktop/mate-desktop-item.c
-index eb004d9..c0ee1da 100644
---- a/libmate-desktop/mate-desktop-item.c
-+++ b/libmate-desktop/mate-desktop-item.c
-@@ -1721,6 +1721,17 @@ make_environment_for_screen (GdkScreen  *screen,
- 	return retval;
- }
- 
-+static void
-+dummy_child_watch (GPid         pid,
-+		   gint         status,
-+		   gpointer user_data)
-+{
-+	/* Nothing, this is just to ensure we don't double fork
-+	 * and break pkexec:
-+	 * https://bugzilla.gnome.org/show_bug.cgi?id=675789
-+	 */
-+}
-+
- static int
- ditem_execute (const MateDesktopItem *item,
- 	       const char *exec,
-@@ -1749,6 +1760,7 @@ ditem_execute (const MateDesktopItem *item,
- 	char *new_exec, *uris, *temp;
- 	char *exec_locale;
- 	int launched = 0;
-+	GPid pid;
- #ifdef HAVE_STARTUP_NOTIFICATION
- 	GdkDisplay *gdkdisplay;
- 	SnLauncherContext *sn_context;
-@@ -1957,14 +1969,17 @@ ditem_execute (const MateDesktopItem *item,
- 				      (do_not_reap_child ? G_SPAWN_DO_NOT_REAP_CHILD : 0) | G_SPAWN_SEARCH_PATH /* flags */,
- 				      NULL, /* child_setup_func */
- 				      NULL, /* child_setup_func_data */
--				      &ret /* child_pid */,
-+				      (do_not_reap_child ? &pid : NULL) /* child_pid */,
- 				      error)) {
- 			/* The error was set for us,
- 			 * we just can't launch this thingie */
- 			ret = -1;
- 			g_strfreev (real_argv);
- 			break;
-+		} else if (do_not_reap_child) {
-+			g_child_watch_add (pid, dummy_child_watch, NULL);
- 		}
-+
- 		launched ++;
- 
- 		g_strfreev (real_argv);
-
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mate-desktop.git/commit/?h=f22&id=e4754b05c83e5272ead70e66b76dafe0f3c6e6e4