diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2011-12-02 16:22:01 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-12-08 18:05:12 -0500 |
| commit | 45818762d398588fd36be138e9981525d98bf687 (patch) | |
| tree | 77e18a6dce5d6f9e9150cf4e350a527f597c0076 /gio/gapplicationimpl-dbus.c | |
| parent | 888a52034bcd06b6b5aeac98d372216d1f7b2798 (diff) | |
| download | glib-45818762d398588fd36be138e9981525d98bf687.tar.gz | |
Revert "Forgot one interface..."
This reverts commit 30580bdca7764525a49899dd56dcdde25a300a21.
Diffstat (limited to 'gio/gapplicationimpl-dbus.c')
| -rw-r--r-- | gio/gapplicationimpl-dbus.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c index 9e95e2772..553cd4a7a 100644 --- a/gio/gapplicationimpl-dbus.c +++ b/gio/gapplicationimpl-dbus.c @@ -41,7 +41,6 @@ get_interface (const gchar *name) { static GDBusInterfaceInfo *org_gtk_Application; static GDBusInterfaceInfo *org_gtk_private_CommandLine; - static GDBusInterfaceInfo *org_gtk_Actions; if (org_gtk_Application == NULL) { @@ -74,21 +73,6 @@ get_interface (const gchar *name) " <arg type='s' name='message' direction='in'/>" " </method>" " </interface>" - " <interface name='org.gtk.Actions'>" - " <method name='DescribeAll'>" - " <arg type='a(savbav)' name='list' direction='out'/>" - " </method>" - " <method name='SetState'>" - " <arg type='s' name='action_name' direction='in'/>" - " <arg type='v' name='value' direction='in'/>" - " <arg type='a{sv}' name='platform_data' direction='in'/>" - " </method>" - " <method name='Activate'>" - " <arg type='s' name='action_name' direction='in'/>" - " <arg type='av' name='parameter' direction='in'/>" - " <arg type='a{sv}' name='platform_data' direction='in'/>" - " </method>" - " </interface>" "</node>", &error); if (info == NULL) @@ -102,19 +86,13 @@ get_interface (const gchar *name) g_assert (org_gtk_private_CommandLine != NULL); g_dbus_interface_info_ref (org_gtk_private_CommandLine); - org_gtk_Actions = g_dbus_node_info_lookup_interface (info, "org.gtk.Actions"); - g_assert (org_gtk_Actions != NULL); - g_dbus_interface_info_ref (org_gtk_Actions); - g_dbus_node_info_unref (info); } if (strcmp (name, "org.gtk.Application") == 0) return org_gtk_Application; - else if (strcmp (name, "org.gtk.private.CommandLine") == 0) - return org_gtk_private_CommandLine; else - return org_gtk_Actions; + return org_gtk_private_CommandLine; } /* GApplication implementation {{{1 */ @@ -606,7 +584,8 @@ g_application_impl_register (GApplication *application, impl->action_id = g_dbus_connection_register_object (impl->session_bus, impl->object_path, - get_interface ("org.gtk.Actions"), + (GDBusInterfaceInfo *) + &org_gtk_Actions, &actions_vtable, impl, NULL, error); |