gedit r6983 - in trunk: . gedit/smclient

[pborelli svn gnome org]

Author: pborelli
Date: Thu Apr  9 07:23:22 2009
New Revision: 6983
URL: http://svn.gnome.org/viewvc/gedit?rev=6983&view=rev

Log:
2009-04-09  Paolo Borelli  <pborelli katamail com>

	* gedit/smclient/eggsmclient-xsmp.c:
	Updated from libegg.



Modified:
   trunk/ChangeLog
   trunk/gedit/smclient/eggsmclient-xsmp.c

Modified: trunk/gedit/smclient/eggsmclient-xsmp.c
==============================================================================
--- trunk/gedit/smclient/eggsmclient-xsmp.c	(original)
+++ trunk/gedit/smclient/eggsmclient-xsmp.c	Thu Apr  9 07:23:22 2009
@@ -795,10 +795,14 @@
   if (desktop_file)
     {
       GKeyFile *merged_file;
+      char *desktop_file_path;
 
       merged_file = g_key_file_new ();
-      if (g_key_file_load_from_file (merged_file,
-				     egg_desktop_file_get_source (desktop_file),
+      desktop_file_path =
+	g_filename_from_uri (egg_desktop_file_get_source (desktop_file),
+			     NULL, NULL);
+      if (desktop_file_path &&
+	  g_key_file_load_from_file (merged_file, desktop_file_path,
 				     G_KEY_FILE_KEEP_COMMENTS |
 				     G_KEY_FILE_KEEP_TRANSLATIONS, NULL))
 	{
@@ -841,8 +845,11 @@
 				 EGG_DESKTOP_FILE_KEY_EXEC,
 				 exec);
 	  g_free (exec);
-
 	}
+      else
+	desktop_file = NULL;
+
+      g_free (desktop_file_path);
     }
 
   /* Now write state_file to disk. (We can't use mktemp(), because