luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-23 02:17:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

GApplication: receiving end of GRemoteActionGroup

Browse Source 
Use the fact that the action group exporter now speaks to
GRemoteActionGroup to get the platform data into GApplicion without
hacks.

https://bugzilla.gnome.org/show_bug.cgi?id=665737
This commit is contained in:
Ryan Lortie
2011-12-17 00:52:57 -05:00
parent 1807ef336a
commit 0971d36e4b
3 changed files with 100 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gapplicationimpl-dbus.c
View File

@@ -87,6 +87,7 @@ static GDBusInterfaceInfo *org_gtk_private_CommandLine;
struct _GApplicationImpl
{
GDBusConnection *session_bus;
GActionGroup *exported_actions;
const gchar *bus_name;
gchar *object_path;
@@ -377,7 +378,8 @@ g_application_impl_attempt_primary (GApplicationImpl *impl,
if (impl->object_id == 0)
return FALSE;
impl->actions_id = g_dbus_connection_export_action_group (impl->session_bus, impl->object_path, impl->app, error);
impl->actions_id = g_dbus_connection_export_action_group (impl->session_bus, impl->object_path,
impl->exported_actions, error);
if (impl->actions_id == 0)
return FALSE;
@@ -477,6 +479,7 @@ GApplicationImpl *
g_application_impl_register (GApplication *application,
const gchar *appid,
GApplicationFlags flags,
GActionGroup *exported_actions,
GRemoteActionGroup **remote_actions,
GCancellable *cancellable,
GError **error)
@@ -487,6 +490,7 @@ g_application_impl_register (GApplication *application,
impl = g_slice_new0 (GApplicationImpl);
impl->app = application;
impl->exported_actions = exported_actions;
impl->bus_name = appid;
impl->session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, cancellable, NULL);