callisto-debian/mate-session-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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).

Browse Source
This commit is contained in:
Mike Gabriel
2015-01-21 12:37:17 +01:00
parent 5829b6880d
commit 4f1b0030e3
2 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
debian/patches/0002_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch vendored Normal file
View File

@ -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);
}

1
debian/patches/series vendored
View File

@ -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