[mate-session-manager] 07/15: debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch: Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository mate-session-manager.

commit b335abdcb48315ebb786ada01a364950a84bf2bd
Author: Martin Wimpress <code at flexion.org>
Date:   Fri Jun 12 16:04:10 2015 +0100

    debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch: Applied upstream.
---
 ...low-users-to-disable-one-or-both-compatib.patch | 65 ----------------------
 1 file changed, 65 deletions(-)

diff --git a/debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch b/debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
deleted file mode 100644
index aa05b54..0000000
--- a/debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 47049eaad4650307650b904b3c44a8f1650bc49e Mon Sep 17 00:00:00 2001
-From: Colomban Wendling <lists.ban at herbesfolles.org>
-Date: Tue, 20 Jan 2015 17:45:34 +0000
-Subject: MsmGnome: Fix and simplify logic
-
----
---- a/mate-session/msm-gnome.c
-+++ b/mate-session/msm-gnome.c
-@@ -237,8 +237,6 @@
- {
-   GSettings* settings;
-   gchar **array;
--  GList *startup = NULL;
--  gint i;
- 
-   if (gnome_compat_started == TRUE)
-     return;
-@@ -246,32 +244,26 @@
-   settings = g_settings_new (GSM_SCHEMA);
-   array = g_settings_get_strv (settings, GSM_GNOME_COMPAT_STARTUP_KEY);
-   if (array) {
--    for (i = 0; array[i]; i++) {
--      startup = g_list_append (startup, g_strdup (array[i]));
--    }
--  }
--  g_strfreev (array);
--  g_object_unref (settings);
-+    guint i;
- 
--  if (startup != NULL) {
--    if (g_list_find_custom (startup, "smproxy", (GCompareFunc) strcmp) != NULL) {
--      g_debug ("MsmGnome: starting smproxy");
--      msm_compat_gnome_smproxy_startup ();
--      gnome_compat_started = TRUE;
--    } else if (g_list_find_custom (startup, "keyring", (GCompareFunc) strcmp) != NULL) {
--      g_debug ("MsmGnome: starting keyring");
--      gnome_keyring_daemon_startup ();
--      gnome_compat_started = TRUE;
--    } else {
--      g_debug ("MsmGnome: unknown component, ignoring");
-+    for (i = 0; array[i]; i++) {
-+      if (strcmp (array[i], "smproxy") == 0) {
-+        g_debug ("MsmGnome: starting smproxy");
-+        msm_compat_gnome_smproxy_startup ();
-+        gnome_compat_started = TRUE;
-+      } else if (strcmp (array[i], "keyring") == 0) {
-+        g_debug ("MsmGnome: starting keyring");
-+        gnome_keyring_daemon_startup ();
-+        gnome_compat_started = TRUE;
-+      } else {
-+        g_debug ("MsmGnome: ignoring unknown component \"%s\"", array[i]);
-+      }
-     }
--
--  g_list_foreach (startup, (GFunc) g_free, NULL);
--  g_list_free (startup);
--
-+    g_strfreev (array);
-   } else {
-     g_debug ("MsmGnome: No components found to start");
-   }
-+  g_object_unref (settings);
- }
- 
- 

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