diff options
| author | Ernestas Kulik <ernestask@src.gnome.org> | 2016-10-23 17:54:46 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@src.gnome.org> | 2016-10-24 17:20:59 +0300 |
| commit | ea92d8622e9c153678b10955600ea0189764e61b (patch) | |
| tree | 0daa4b85ea3149c17282009055897d8e0f1b76d2 /src/nautilus-application.c | |
| parent | 9fa6a1fc50847fc97b7a561d3bfe3a47e8746150 (diff) | |
| download | nautilus-ea92d8622e9c153678b10955600ea0189764e61b.tar.gz | |
application: clear dbus_manager and search_provider after unregistering
The search provider gets unregistered twice when trying to run Nautilus
with a primary instance active, resulting in the infamous warning:
GLib-GIO-CRITICAL **: g_dbus_interface_skeleton_unexport: assertion
'interface_->priv->connections != NULL' failed
The fix is clearing both dbus_manager and search_provider in
nautilus_application_dbus_unregister() as opposed to during
finalization.
https://bugzilla.gnome.org/show_bug.cgi?id=773383
Diffstat (limited to 'src/nautilus-application.c')
| -rw-r--r-- | src/nautilus-application.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c index b80c60ab1..fa07dda4a 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -604,9 +604,7 @@ nautilus_application_finalize (GObject *object) g_clear_object (&priv->progress_handler); g_clear_object (&priv->bookmark_list); - g_clear_object (&priv->dbus_manager); g_clear_object (&priv->fdb_manager); - g_clear_object (&priv->search_provider); g_list_free (priv->windows); @@ -1299,11 +1297,13 @@ nautilus_application_dbus_unregister (GApplication *app, if (priv->dbus_manager) { nautilus_dbus_manager_unregister (priv->dbus_manager); + g_clear_object (&priv->dbus_manager); } if (priv->search_provider) { nautilus_shell_search_provider_unregister (priv->search_provider); + g_clear_object (&priv->search_provider); } } |