[gnome-packagekit/glib2: 42/79] moo

[Richard Hughes <rhughes src gnome org>]

commit 91614e2f6aea013623dc3eca4ef392d1e7b1f9da
Author: Richard Hughes <richard hughsie com>
Date:   Wed Sep 23 16:01:50 2009 +0100

    moo

 src/gpk-check-update.c |   10 +++++-----
 src/gpk-watch.c        |   33 ++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index 52e8d32..20e5d86 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -1138,10 +1138,10 @@ gpk_check_update_restart_schedule_cb (PkClient *client, GpkCheckUpdate *cupdate)
 }
 
 /**
- * gpk_check_update_task_list_changed_cb:
+ * gpk_check_update_transaction_list_changed_cb:
  **/
 static void
-gpk_check_update_task_list_changed_cb (PkTransactionList *tlist, GpkCheckUpdate *cupdate)
+gpk_check_update_transaction_list_changed_cb (PkControl *control, GpkCheckUpdate *cupdate)
 {
 	PkBitfield roles;
 	g_return_if_fail (GPK_IS_CHECK_UPDATE (cupdate));
@@ -1299,7 +1299,7 @@ gpk_check_update_notify_network_status_cb (PkControl *control, GParamSpec *pspec
 {
 	PkNetworkEnum *status;
 
-	g_object_get (control, "network-status", &status, NULL);
+	g_object_get (control, "network-state", &status, NULL);
 
 	/* inhibit icon when we are offline */
 	cupdate->priv->icon_inhibit_network_offline = (status == PK_NETWORK_ENUM_OFFLINE);
@@ -1440,6 +1440,8 @@ gpk_check_update_init (GpkCheckUpdate *cupdate)
 	cupdate->priv->control = pk_control_new ();
 	g_signal_connect (cupdate->priv->control, "updates-changed",
 			  G_CALLBACK (gpk_check_update_updates_changed_cb), cupdate);
+	g_signal_connect (cupdate->priv->control, "transaction-list-changed",
+			  G_CALLBACK (gpk_check_update_transaction_list_changed_cb), cupdate);
 	g_signal_connect (cupdate->priv->control, "restart-schedule",
 			  G_CALLBACK (gpk_check_update_restart_schedule_cb), cupdate);
 	g_signal_connect (cupdate->priv->control, "notify::network-state",
@@ -1447,8 +1449,6 @@ gpk_check_update_init (GpkCheckUpdate *cupdate)
 
 	/* we need the task list so we can hide the update icon when we are doing the update */
 	cupdate->priv->tlist = pk_transaction_list_new ();
-	g_signal_connect (cupdate->priv->tlist, "changed",
-			  G_CALLBACK (gpk_check_update_task_list_changed_cb), cupdate);
 
 	roles = gpk_check_update_get_active_roles (cupdate);
 	/* coldplug update in progress */
diff --git a/src/gpk-watch.c b/src/gpk-watch.c
index 2c0dffe..c0b0c87 100644
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@ -976,21 +976,6 @@ gpk_watch_activate_status_cb (GtkStatusIcon *status_icon, GpkWatch *watch)
 }
 
 /**
- * gpk_watch_locked_cb:
- **/
-static void
-gpk_watch_locked_cb (PkClient *client, gboolean is_locked, GpkWatch *watch)
-{
-	g_return_if_fail (GPK_IS_WATCH (watch));
-
-	egg_debug ("setting locked %i, doing g-p-m (un)inhibit", is_locked);
-	if (is_locked)
-		gpk_inhibit_create (watch->priv->inhibit);
-	else
-		gpk_inhibit_remove (watch->priv->inhibit);
-}
-
-/**
  * gpk_watch_get_proxy_ftp:
  * Return value: server.lan:8080
  **/
@@ -1229,6 +1214,20 @@ gpk_watch_notify_connected_cb (PkControl *control, GParamSpec *pspec, GpkWatch *
 }
 
 /**
+ * gpk_watch_notify_locked_cb:
+ **/
+static void
+gpk_watch_notify_locked_cb (PkControl *control, GParamSpec *pspec, GpkWatch *watch)
+{
+	gboolean locked;
+	g_object_get (control, "locked", &locked, NULL);
+	if (locked)
+		gpk_inhibit_create (watch->priv->inhibit);
+	else
+		gpk_inhibit_remove (watch->priv->inhibit);
+}
+
+/**
  * gpk_watch_is_message_ignored:
  **/
 static gboolean
@@ -1717,8 +1716,8 @@ gpk_watch_init (GpkWatch *watch)
 
 	/* we need to get ::locked */
 	watch->priv->control = pk_control_new ();
-	g_signal_connect (watch->priv->control, "locked",
-			  G_CALLBACK (gpk_watch_locked_cb), watch);
+	g_signal_connect (watch->priv->control, "notify::locked",
+			  G_CALLBACK (gpk_watch_notify_locked_cb), watch);
 	g_signal_connect (watch->priv->control, "notify::connected",
 			  G_CALLBACK (gpk_watch_notify_connected_cb), watch);