raveit65 pushed to mate-session-manager (epel7). "add a upstream patch"

[notifications at fedoraproject.org]

>From 6165134425827df6c3de358123e171c58013c398 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Wed, 11 Mar 2015 16:02:46 +0100
Subject: add a upstream patch


diff --git a/mate-session-manager_avoid-dereferencing-NULL-pointer.patch b/mate-session-manager_avoid-dereferencing-NULL-pointer.patch
new file mode 100644
index 0000000..58a1da7
--- /dev/null
+++ b/mate-session-manager_avoid-dereferencing-NULL-pointer.patch
@@ -0,0 +1,33 @@
+diff --git a/mate-session/main.c b/mate-session/main.c
+index 63cc5fc..f5f5734 100644
+--- a/mate-session/main.c
++++ b/mate-session/main.c
+@@ -249,15 +249,16 @@ static void append_required_apps(GsmManager* manager)
+ 	{
+ 		g_warning("No required applications specified");
+ 	}
+-
+-	for (i = 0; required_components[i]; i++)
++	else
+ 	{
++		for (i = 0; required_components[i]; i++)
++		{
+ 			char* default_provider;
+ 			const char* component;
+ 
+ 			if (IS_STRING_EMPTY((char*) required_components[i]))
+ 			{
+-					continue;
++				continue;
+ 			}
+ 
+ 			component = required_components[i];
+@@ -285,6 +286,7 @@ static void append_required_apps(GsmManager* manager)
+ 			}
+ 
+ 			g_free(default_provider);
++		}
+ 	}
+ 
+ 	g_debug("main: *** Done adding required apps");
+
diff --git a/x-caja.patch b/x-caja.patch
deleted file mode 100644
index 64d6bbc..0000000
--- a/x-caja.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/data/org.mate.session.gschema.xml.in.in b/data/org.mate.session.gschema.xml.in.in
-index a40ca2a..2415c67 100644
---- a/data/org.mate.session.gschema.xml.in.in
-+++ b/data/org.mate.session.gschema.xml.in.in
-@@ -1,5 +1,10 @@
- <schemalist>
-   <schema id="org.mate.session" path="/org/mate/desktop/session/">
-+    <key name="session-start" type="i">
-+      <default>0</default>
-+      <_summary>Current session start time</_summary>
-+      <_description>Unix time of the start of the current session.</_description>
-+    </key>
-     <key name="auto-save-session" type="b">
-       <default>false</default>
-       <_summary>Save sessions</_summary>
-diff --git a/mate-session/main.c b/mate-session/main.c
-index da2a687..4dd8fd1 100644
---- a/mate-session/main.c
-+++ b/mate-session/main.c
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <time.h>
- 
- #include <glib/gi18n.h>
- #include <glib.h>
-@@ -67,6 +68,27 @@ static gboolean failsafe = FALSE;
- static gboolean show_version = FALSE;
- static gboolean debug = FALSE;
- 
-+static gboolean
-+initialize_gsettings (void)
-+{
-+	GSettings* settings;
-+	time_t now = time (0);
-+	gboolean ret;
-+
-+	settings = g_settings_new (GSM_SCHEMA);
-+
-+	if (!settings)
-+		return FALSE;
-+
-+	ret = g_settings_set_int (settings, "session-start", now);
-+
-+	g_settings_sync ();
-+
-+	g_object_unref (settings);
-+
-+        return ret;
-+}
-+	
- static void on_bus_name_lost(DBusGProxy* bus_proxy, const char* name, gpointer data)
- {
- 	g_warning("Lost name on bus: %s, exiting", name);
-@@ -505,6 +527,13 @@ int main(int argc, char** argv)
- 	 */
- 	gsm_util_setenv("MATE_DESKTOP_SESSION_ID", "this-is-deprecated");
- 
-+        /*
-+         * Make sure gsettings is set up correctly.  If not, then bail.
-+         */
-+
-+        if (initialize_gsettings () != TRUE)
-+		exit (1);
-+
- 	client_store = gsm_store_new();
- 
- 	xsmp_server = gsm_xsmp_server_new(client_store);
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mate-session-manager.git/commit/?h=epel7&id=6165134425827df6c3de358123e171c58013c398