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

[mccann svn gnome org]

Author: mccann
Date: Fri Jul 25 15:15:20 2008
New Revision: 4848
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4848&view=rev

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

	* gnome-session/gsm-inhibit-dialog.c (add_inhibitor):
	Also check for desktop files using a gnome vendor prefix.



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

Modified: branches/dbus_based/gnome-session/gsm-inhibit-dialog.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-inhibit-dialog.c	(original)
+++ branches/dbus_based/gnome-session/gsm-inhibit-dialog.c	Fri Jul 25 15:15:20 2008
@@ -280,6 +280,18 @@
                 desktop_file = egg_desktop_file_new_from_dirs (desktop_filename,
                                                                (const char **)search_dirs,
                                                                &error);
+
+                /* look for a file with a vendor prefix */
+                if (desktop_file == NULL) {
+                        g_warning ("Unable to find desktop file '%s': %s", desktop_filename, error->message);
+                        g_error_free (error);
+                        g_free (desktop_filename);
+                        desktop_filename = g_strdup_printf ("gnome-%s.desktop", app_id);
+                        error = NULL;
+                        desktop_file = egg_desktop_file_new_from_dirs (desktop_filename,
+                                                                       (const char **)search_dirs,
+                                                                       &error);
+                }
                 g_strfreev (search_dirs);
 
                 if (desktop_file == NULL) {