File PackageKit-destroy-and-recreate.patch of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File PackageKit-destroy-and-recreate.patch of Package PackageKit

From e1498ff60188eaf1a4ef58ee207ee5b900189550 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 23 Sep 2013 16:34:58 +0100
Subject: [PATCH] lib: Destroy and re-create the control proxy if the server changes

Although I don't think this shouldn't be required as org.freedesktop.PackageKit
is a well-known service, it seems that from gnome-software we need to manually
disconnect and reconnect when packagekitd is restarted.

Weirdly, gnome-packagekit isn't affected in the same way.
---
 lib/packagekit-glib2/pk-control.c |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/lib/packagekit-glib2/pk-control.c b/lib/packagekit-glib2/pk-control.c
index 9477e65..e319bea 100644
--- a/lib/packagekit-glib2/pk-control.c
+++ b/lib/packagekit-glib2/pk-control.c
@@ -2447,6 +2447,24 @@ pk_control_name_appeared_cb (GDBusConnection *connection,
 }
 
 /**
+ * pk_control_proxy_destroy:
+ **/
+static void
+pk_control_proxy_destroy (PkControl *control)
+{
+	if (control->priv->proxy == NULL)
+		return;
+	g_signal_handlers_disconnect_by_func (control->priv->proxy,
+					      G_CALLBACK (pk_control_properties_changed_cb),
+					      control);
+	g_signal_handlers_disconnect_by_func (control->priv->proxy,
+					      G_CALLBACK (pk_control_signal_cb),
+					      control);
+	g_object_unref (control->priv->proxy);
+	control->priv->proxy = NULL;
+}
+
+/**
  * pk_control_name_vanished_cb:
  **/
 static void
@@ -2458,6 +2476,11 @@ pk_control_name_vanished_cb (GDBusConnection *connection,
 	control->priv->connected = FALSE;
 	g_debug ("notify::connected");
 	g_object_notify (G_OBJECT(control), "connected");
+
+	/* destroy the proxy, as even though it's "well known" we get a
+	 * GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown if we try to
+	 * use this after the server has restarted */
+	pk_control_proxy_destroy (control);
 }
 
 /**
@@ -2497,6 +2520,9 @@ pk_control_finalize (GObject *object)
 	g_cancellable_cancel (priv->cancellable);
 	g_bus_unwatch_name (priv->watch_id);
 
+	/* disconnect proxy and destroy it */
+	pk_control_proxy_destroy (control);
+
 	/* remove pending sources */
 	if (priv->transaction_list_changed_id != 0)
 		g_source_remove (priv->transaction_list_changed_id);
@@ -2506,15 +2532,6 @@ pk_control_finalize (GObject *object)
 		g_source_remove (priv->updates_changed_id);
 	if (priv->repo_list_changed_id != 0)
 		g_source_remove (priv->repo_list_changed_id);
-	if (priv->proxy != NULL) {
-		g_signal_handlers_disconnect_by_func (priv->proxy,
-						      G_CALLBACK (pk_control_properties_changed_cb),
-						      control);
-		g_signal_handlers_disconnect_by_func (priv->proxy,
-						      G_CALLBACK (pk_control_signal_cb),
-						      control);
-		g_object_unref (priv->proxy);
-	}
 
 	g_free (priv->backend_name);
 	g_free (priv->backend_description);
-- 
1.7.1

Places

File PackageKit-destroy-and-recreate.patch of Package PackageKit

Places