From 45818762d398588fd36be138e9981525d98bf687 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 2 Dec 2011 16:22:01 -0500 Subject: [PATCH] Revert "Forgot one interface..." This reverts commit 30580bdca7764525a49899dd56dcdde25a300a21. --- gio/gapplicationimpl-dbus.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c index 9e95e27..553cd4a 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) " " " " " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " "", &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); -- 2.7.4