From 4f1b0030e384d61c7c2c6ddc35061cf761353225 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Jan 2015 12:37:17 +0100
Subject: [PATCH] debian/patches: Add
 0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch. Follow-up
 patch for previously added dconf switch that handles gnome-keyring and
 smproxy compat mode (see: #775198). (Closes: #775571).

---
 ...sers-to-disable-one-or-both-compatib.patch | 65 +++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 66 insertions(+)
 create mode 100644 debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch

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
new file mode 100644
index 0000000..aa05b54
--- /dev/null
+++ b/debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
@@ -0,0 +1,65 @@
+From 47049eaad4650307650b904b3c44a8f1650bc49e Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <lists.ban@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);
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d3536da..4783a6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
+0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
 1001_hypen-used-as-minus-sign-man-page-fix.patch