[epiphany/mcatanzaro/search-provider: 2/4] search-provider: create skeleton in dbus_register()
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mcatanzaro/search-provider: 2/4] search-provider: create skeleton in dbus_register()
- Date: Fri, 5 Apr 2019 16:46:32 +0000 (UTC)
commit ab3f97da1ad45988f2c0d44305cd65ced6dbe3ff
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Fri Apr 5 10:57:06 2019 -0500
search-provider: create skeleton in dbus_register()
It should parallel dbus_unregister(), which is where we destroy it.
src/search-provider/ephy-search-provider.c | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/src/search-provider/ephy-search-provider.c b/src/search-provider/ephy-search-provider.c
index daacbcc0f..00301a954 100644
--- a/src/search-provider/ephy-search-provider.c
+++ b/src/search-provider/ephy-search-provider.c
@@ -327,19 +327,6 @@ ephy_search_provider_init (EphySearchProvider *self)
g_application_set_flags (G_APPLICATION (self), G_APPLICATION_IS_SERVICE);
- self->skeleton = ephy_shell_search_provider2_skeleton_new ();
-
- g_signal_connect (self->skeleton, "handle-get-initial-result-set",
- G_CALLBACK (handle_get_initial_result_set), self);
- g_signal_connect (self->skeleton, "handle-get-subsearch-result-set",
- G_CALLBACK (handle_get_subsearch_result_set), self);
- g_signal_connect (self->skeleton, "handle-get-result-metas",
- G_CALLBACK (handle_get_result_metas), self);
- g_signal_connect (self->skeleton, "handle-activate-result",
- G_CALLBACK (handle_activate_result), self);
- g_signal_connect (self->skeleton, "handle-launch-search",
- G_CALLBACK (handle_launch_search), self);
-
self->settings = g_settings_new (EPHY_PREFS_SCHEMA);
filename = g_build_filename (ephy_profile_dir (), EPHY_HISTORY_FILE, NULL);
@@ -360,7 +347,6 @@ ephy_search_provider_dbus_register (GApplication *application,
GError **error)
{
EphySearchProvider *self;
- GDBusInterfaceSkeleton *skeleton;
if (!G_APPLICATION_CLASS (ephy_search_provider_parent_class)->dbus_register (application,
connection,
@@ -369,9 +355,21 @@ ephy_search_provider_dbus_register (GApplication *application,
return FALSE;
self = EPHY_SEARCH_PROVIDER (application);
- skeleton = G_DBUS_INTERFACE_SKELETON (self->skeleton);
+ self->skeleton = ephy_shell_search_provider2_skeleton_new ();
+
+ g_signal_connect (self->skeleton, "handle-get-initial-result-set",
+ G_CALLBACK (handle_get_initial_result_set), self);
+ g_signal_connect (self->skeleton, "handle-get-subsearch-result-set",
+ G_CALLBACK (handle_get_subsearch_result_set), self);
+ g_signal_connect (self->skeleton, "handle-get-result-metas",
+ G_CALLBACK (handle_get_result_metas), self);
+ g_signal_connect (self->skeleton, "handle-activate-result",
+ G_CALLBACK (handle_activate_result), self);
+ g_signal_connect (self->skeleton, "handle-launch-search",
+ G_CALLBACK (handle_launch_search), self);
- return g_dbus_interface_skeleton_export (skeleton, connection, object_path, error);
+ return g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->skeleton),
+ connection, object_path, error);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]