callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk-launch: add hack to close up dbus-daemon race

Browse Source 
If gtk-launch exits before the program it starts fully activates,
then the dbus-daemon may avoid doing the activating method call.

This commit works around the problem by pinging the activated
application, and waiting for a reply.

This is similar to the gvfs-open bug here:

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

https://bugzilla.gnome.org/show_bug.cgi?id=763103
This commit is contained in:
Ray Strode 2016-03-04 10:02:34 -05:00
parent 88d51a8604
commit 50598ee08f
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtk-launch.c
View File

@ -51,6 +51,7 @@ main (int argc, char *argv[])
gchar *app_name; gchar *app_name;
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
gchar *desktop_file_name; gchar *desktop_file_name;
gchar *bus_name = NULL;
#endif #endif
GAppInfo *info = NULL; GAppInfo *info = NULL;
GAppLaunchContext *launch_context; GAppLaunchContext *launch_context;
@ -119,10 +120,19 @@ main (int argc, char *argv[])
app_name = *args; app_name = *args;
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
bus_name = g_strdup (app_name);
if (g_str_has_suffix (app_name, ".desktop")) if (g_str_has_suffix (app_name, ".desktop"))
desktop_file_name = g_strdup (app_name); {
desktop_file_name = g_strdup (app_name);
bus_name[strlen (bus_name) - strlen(".desktop")] = '\0';
}
else else
desktop_file_name = g_strconcat (app_name, ".desktop", NULL); {
desktop_file_name = g_strconcat (app_name, ".desktop", NULL);
}
if (!g_dbus_is_name (bus_name))
g_clear_pointer (&bus_name, g_free);
info = G_APP_INFO (g_desktop_app_info_new (desktop_file_name)); info = G_APP_INFO (g_desktop_app_info_new (desktop_file_name));
g_free (desktop_file_name); g_free (desktop_file_name);
#else #else
@ -159,6 +169,33 @@ main (int argc, char *argv[])
} }
g_object_unref (info); g_object_unref (info);
g_object_unref (launch_context); g_object_unref (launch_context);
#ifdef G_OS_UNIX
if (bus_name != NULL)
{
GDBusConnection *connection;
gchar *object_path, *p;
connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
object_path = g_strdup_printf ("/%s", bus_name);
for (p = object_path; *p != '\0'; p++)
if (*p == '.')
*p = '/';
if (connection)
g_dbus_connection_call_sync (connection,
bus_name,
object_path,
"org.freedesktop.DBus.Peer",
"Ping",
NULL, NULL,
G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
g_clear_pointer (&object_path, g_free);
g_clear_object (&connection);
g_clear_pointer (&bus_name, g_free);
}
#endif
g_list_free_full (l, g_object_unref); g_list_free_full (l, g_object_unref);
return 0; return 0;