From 2890929b32c38c8c99ce381dd20b4df30d24f2ad Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 8 Feb 2012 18:25:18 +0000 Subject: merge request comments acted upon --- src/apt-watcher.c | 15 ++++----------- src/apt-watcher.h | 1 - 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/apt-watcher.c b/src/apt-watcher.c index 4e69ee6..6e8a5c9 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -52,11 +52,11 @@ get_updates_complete (GObject *source_object, AptWatcher* self = APT_WATCHER (user_data); PkResults *results; + GError *error = NULL; + results = pk_client_generic_finish (PK_CLIENT(source_object), res, &error); - results = pk_client_generic_finish (PK_CLIENT(source_object), res, NULL); - - if (results == NULL){ - g_warning ("Unable to query for updates - results were NULL ?"); + if (error != NULL){ + g_warning ("Unable to query for updates - error - %s", error->message); return; } @@ -110,7 +110,6 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy, g_return_if_fail (APT_IS_WATCHER (user_data)); AptWatcher* self = APT_WATCHER (user_data); - g_variant_ref_sink (parameters); g_debug ("apt-watcher-signal cb signal name - %s", signal_name); if (g_strcmp0(signal_name, "UpdatesChanged") == 0){ g_debug ("updates changed signal received"); @@ -125,12 +124,6 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy, DBUSMENU_MENUITEM_PROP_DISPOSITION, DBUSMENU_MENUITEM_DISPOSITION_ALERT); } - else if (g_strcmp0(signal_name, "TransactionListChanged") == 0) { - GVariant *value = g_variant_get_child_value (parameters, 0); - g_variant_unref (value); - - } - g_variant_unref (parameters); } static void diff --git a/src/apt-watcher.h b/src/apt-watcher.h index 54d26f5..c571502 100644 --- a/src/apt-watcher.h +++ b/src/apt-watcher.h @@ -28,7 +28,6 @@ with this program. If not, see . #include #include "session-dbus.h" -#include "dbus-shared-names.h" G_BEGIN_DECLS -- cgit v1.2.3