gnome-session r4872 - in branches/dbus_based: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Tue Jul 29 04:37:44 2008
New Revision: 4872
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4872&view=rev

Log:
2008-07-29  William Jon McCann  <jmccann redhat com>

	* gnome-session/gsm-manager.c (append_default_apps):
	Check for gnome vendor prefix on default apps.



Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/gnome-session/gsm-manager.c

Modified: branches/dbus_based/gnome-session/gsm-manager.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-manager.c	(original)
+++ branches/dbus_based/gnome-session/gsm-manager.c	Tue Jul 29 04:37:44 2008
@@ -96,7 +96,6 @@
          * and shouldn't be automatically restarted */
         GSList                 *condition_clients;
 
-
         DBusGProxy             *bus_proxy;
         DBusGConnection        *connection;
 };
@@ -1627,6 +1626,28 @@
                                                    NULL);
                 }
 
+                /* look for gnome vender prefix */
+                if (app_path == NULL) {
+                        g_free (desktop_file);
+                        desktop_file = g_strdup_printf ("gnome-%s.desktop", (char *) a->data);
+
+                        g_key_file_load_from_dirs (key_file,
+                                                   desktop_file,
+                                                   (const gchar**) app_dirs,
+                                                   &app_path,
+                                                   G_KEY_FILE_NONE,
+                                                   NULL);
+                }
+
+                if (app_path == NULL) {
+                        g_key_file_load_from_dirs (key_file,
+                                                   desktop_file,
+                                                   (const gchar**) autostart_dirs,
+                                                   &app_path,
+                                                   G_KEY_FILE_NONE,
+                                                   NULL);
+                }
+
                 if (app_path != NULL) {
                         GsmApp *app;