From: Ryan Lortie <desrt@desrt.ca>
Date: Thu, 3 Oct 2013 14:02:08 +0000 (-0400)
Subject: appinfo: Don't try DBusActivatable with load_from_keyfile
X-Git-Tag: 2.39.0~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0ffd5c184bd1c0e6d602c406f53ed5f6b765f88;p=platform%2Fupstream%2Fglib.git

appinfo: Don't try DBusActivatable with load_from_keyfile

We can't get the name of the filename, so we can't determine the application
ID.  We'll have to fallback on Exec= for this case.

https://bugzilla.gnome.org/show_bug.cgi?id=709326
---

diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index f6f5bc0..141a89a 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -461,7 +461,10 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info,
       info->path = NULL;
     }
 
-  if (bus_activatable)
+  /* Can only be DBusActivatable if we know the filename, which means
+   * that this won't work for the load-from-keyfile case.
+   */
+  if (bus_activatable && info->filename)
     {
       gchar *basename;
       gchar *last_dot;