From 42fc8277d9a517436ddb4367cd922e8b73a4b632 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 6 Feb 2012 12:11:38 +0000
Subject: handle gtk3 box constructor changes

---
 src/user-widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/user-widget.c b/src/user-widget.c
index 937a9eb..8388ec5 100644
--- a/src/user-widget.c
+++ b/src/user-widget.c
@@ -136,7 +136,7 @@ user_widget_init (UserWidget *self)
   gtk_misc_set_padding (GTK_MISC(priv->user_image),0, 4.0);
   
   priv->user_name = gtk_label_new ("");
-  priv->container = gtk_hbox_new (FALSE, 0);
+  priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in",
                                                    GTK_ICON_SIZE_MENU);
  	gtk_misc_set_alignment(GTK_MISC(priv->tick_icon), 1.0, 0.5);
-- 
cgit v1.2.3


From 64d649ed43bc2f1635862c8cd9d8fceec898b4eb Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 6 Feb 2012 19:31:44 +0000
Subject: pkclient in place

---
 src/apt-watcher.c | 406 ++----------------------------------------------------
 src/apt-watcher.h |   2 +-
 2 files changed, 15 insertions(+), 393 deletions(-)

(limited to 'src')

diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 481029a..07b633d 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -17,104 +17,50 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <gio/gio.h>
+// Conor - 6/2/2012
+// Please pull in packagekit's client lib
+// using apt-get install --no-install-recommends libpackagekit-glib2-dev
+// make sure you don't install package-kit
+#define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
+
 #include <glib/gi18n.h>
+#include <packagekit-glib2/packagekit.h>
 #include "apt-watcher.h"
-#include "apt-transaction.h"
+#include "dbus-shared-names.h"
 
 static guint watcher_id;
 
 struct _AptWatcher
 {
 	GObject parent_instance;
-  guint reboot_query;
-	GCancellable * proxy_cancel;
-	GDBusProxy * proxy;  
   SessionDbus* session_dbus_interface;
   DbusmenuMenuitem* apt_item;
   AptState current_state;
-  AptTransaction* current_transaction;
+  PkClient* pkclient;  
 };
-
-static void
-apt_watcher_on_name_appeared (GDBusConnection *connection,
-                              const gchar     *name,
-                              const gchar     *name_owner,
-                              gpointer         user_data);
-static void
-apt_watcher_on_name_vanished (GDBusConnection *connection,
-                              const gchar     *name,
-                              gpointer         user_data);
-static void fetch_proxy_cb (GObject * object,
-                            GAsyncResult * res,
-                            gpointer user_data);
-
-static void apt_watcher_upgrade_system_cb (GObject * obj,
-                                           GAsyncResult * res,
-                                           gpointer user_data);
-                                                 
-                
+                                                                
 static void apt_watcher_show_apt_dialog (DbusmenuMenuitem* mi,
                                          guint timestamp,
                                          gpointer userdata);
 
-static void apt_watcher_signal_cb (GDBusProxy* proxy,
-                                   gchar* sender_name,
-                                   gchar* signal_name,
-                                   GVariant* parameters,
-                                   gpointer user_data);
-static void  apt_watcher_manage_transactions (AptWatcher* self,
-                                              gchar* transaction_id);
-static gboolean apt_watcher_query_reboot_status (gpointer self);
-static void apt_watcher_transaction_state_simulation_update_cb (AptTransaction* trans,
-                                                                gint update,
-                                                                gpointer user_data);
-static void apt_watcher_transaction_state_real_update_cb (AptTransaction* trans,
-                                                          gint update,
-                                                          gpointer user_data);                                   
-static gboolean apt_watcher_start_apt_interaction (gpointer data);
-
 G_DEFINE_TYPE (AptWatcher, apt_watcher, G_TYPE_OBJECT);
 
 static void
 apt_watcher_init (AptWatcher *self)
 {
   self->current_state = UP_TO_DATE;
-  self->proxy_cancel = g_cancellable_new();
-  self->proxy = NULL;
-  self->reboot_query = 0;
-  self->current_transaction = NULL;  
-  g_timeout_add_seconds (60,
+  self->pkclient = pk_client_new ();
+  /*g_timeout_add_seconds (60,
                          apt_watcher_start_apt_interaction,
-                         self);   
-}
-
-static gboolean 
-apt_watcher_start_apt_interaction (gpointer data)
-{
-  g_return_val_if_fail (APT_IS_WATCHER (data), FALSE);
-  AptWatcher* self = APT_WATCHER (data);
-  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-                            G_DBUS_PROXY_FLAGS_NONE,
-                            NULL,
-                            "org.debian.apt",
-                            "/org/debian/apt",
-                            "org.debian.apt",
-                            self->proxy_cancel,
-                            fetch_proxy_cb,
-                            self);
-  return FALSE;    
+                         self); */
 }
 
 static void
 apt_watcher_finalize (GObject *object)
 {
   g_bus_unwatch_name (watcher_id);  
-  AptWatcher* self = APT_WATCHER (object);
+  //AptWatcher* self = APT_WATCHER (object);
            
-  if (self->proxy != NULL)
-    g_object_unref (self->proxy);
-
 	G_OBJECT_CLASS (apt_watcher_parent_class)->finalize (object);
 }
 
@@ -125,109 +71,6 @@ apt_watcher_class_init (AptWatcherClass *klass)
 	object_class->finalize = apt_watcher_finalize;
 }
 
-static void
-fetch_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
-{
-	GError * error = NULL;
-
-	AptWatcher* self = APT_WATCHER(user_data);
-	g_return_if_fail(self != NULL);
-
-	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
-
-	if (self->proxy_cancel != NULL) {
-		g_object_unref(self->proxy_cancel);
-		self->proxy_cancel = NULL;
-	}
-
-	if (error != NULL) {
-		g_warning("Could not grab DBus proxy for %s: %s",
-               "org.debian.apt", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	self->proxy = proxy;
-  // Set up the watch.
-  watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM,
-                                 "org.debian.apt",
-                                 G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                 apt_watcher_on_name_appeared,
-                                 apt_watcher_on_name_vanished,
-                                 self,
-                                 NULL);
-  
-	g_signal_connect (self->proxy,
-                    "g-signal",
-                    G_CALLBACK(apt_watcher_signal_cb),
-                    self);   
-}
-
-static void
-apt_watcher_on_name_appeared (GDBusConnection *connection,
-                              const gchar     *name,
-                              const gchar     *name_owner,
-                              gpointer         user_data)
-{
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* watcher = APT_WATCHER (user_data);
-  
-  g_print ("Name %s on %s is owned by %s\n",
-           name,
-           "the system bus",
-           name_owner);
-
-  g_dbus_proxy_call (watcher->proxy,
-                     "UpgradeSystem",
-                     g_variant_new("(b)", TRUE),
-                     G_DBUS_CALL_FLAGS_NONE,
-                     -1,
-                     NULL,
-                     apt_watcher_upgrade_system_cb,
-                     user_data);                  
-}
-
-
-static void
-apt_watcher_on_name_vanished (GDBusConnection *connection,
-                              const gchar     *name,
-                              gpointer         user_data)
-{
-  g_debug ("Name %s does not exist or has just vanished",
-           name);
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-}
-
-static void
-apt_watcher_upgrade_system_cb (GObject * obj,
-                               GAsyncResult * res,
-                               gpointer user_data)
-{
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* self = APT_WATCHER (user_data);
-
-	GError * error = NULL;
-	GVariant * result;
-
-	result = g_dbus_proxy_call_finish(self->proxy, res, &error);
-
-	if (error != NULL) {
-    g_warning ("unable to complete the UpgradeSystem apt call");
-    g_error_free (error);
-		return;
-	}
-  
-  gchar* transaction_id = NULL;
-  g_variant_get (result, "(s)", &transaction_id);
-
-  if (transaction_id == NULL){
-    g_warning ("apt_watcher_upgrade_system_cb - transaction id is null");
-    return;
-  }  
-  
-  apt_watcher_manage_transactions (self, transaction_id);
-  
-}
 
 static void
 apt_watcher_show_apt_dialog (DbusmenuMenuitem * mi,
@@ -260,227 +103,6 @@ apt_watcher_show_apt_dialog (DbusmenuMenuitem * mi,
   }   
 }
 
-static void
-apt_watcher_transaction_state_real_update_cb (AptTransaction* trans,
-                                              gint update,
-                                              gpointer user_data)
-{
-  g_debug ("apt-watcher -transaction update %i", update);
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* self = APT_WATCHER (user_data);
-  
-  AptState state = (AptState)update;
-  if (self->current_state != RESTART_NEEDED)
-  {
-    if (state == UP_TO_DATE){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Software Up to Date"));   
-      self->current_state = state;                                                
-    }
-    else if (state == UPDATES_AVAILABLE){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Updates Available…"));    
-      self->current_state = state;                                    
-    }
-    else if (state == UPGRADE_IN_PROGRESS){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Updates Installing…"));    
-      self->current_state = state;                                    
-    }  
-    else if (state == FINISHED){
-      gboolean query_again = FALSE;
-      
-      // Only query if the previous state was an upgrade.
-      if (self->current_state != UPGRADE_IN_PROGRESS){
-        query_again = TRUE;      
-      }    
-      else{
-        if (self->reboot_query != 0){
-          g_source_remove (self->reboot_query);
-          self->reboot_query = 0;
-        }
-        self->reboot_query = g_timeout_add_seconds (1,
-                                                    apt_watcher_query_reboot_status,
-                                                    self);         
-      }
-      self->current_state = state;
-
-      g_object_unref (G_OBJECT(self->current_transaction));
-      self->current_transaction = NULL;
-
-      // It is impossible to determine from a 'real' transaction whether
-      // updates are available therefore it is necessary to check again via a 
-      // simulation whether there are updates available. 
-      if (query_again){
-        g_dbus_proxy_call (self->proxy,
-                           "UpgradeSystem",
-                           g_variant_new("(b)", TRUE),
-                           G_DBUS_CALL_FLAGS_NONE,
-                           -1,
-                           NULL,
-                           apt_watcher_upgrade_system_cb,
-                           self);
-      }      
-    }
-  }
-}                                              
-
-
-static void
-apt_watcher_transaction_state_simulation_update_cb (AptTransaction* trans,
-                                                    gint update,
-                                                    gpointer user_data)
-{
-  g_debug ("apt-watcher -transaction update %i", update);
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* self = APT_WATCHER (user_data);
-  
-  AptState state = (AptState)update;
-  if (self->current_state != RESTART_NEEDED)
-  {
-    if (state == UP_TO_DATE){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Software Up to Date"));   
-      if (self->reboot_query != 0){
-        g_source_remove (self->reboot_query);
-        self->reboot_query = 0;
-      }
-      self->reboot_query = g_timeout_add_seconds (1,
-                                                  apt_watcher_query_reboot_status,
-                                                  self); 
-    }
-    else if (state == UPDATES_AVAILABLE){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Updates Available…"));    
-    }
-    else if (state == UPGRADE_IN_PROGRESS){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Updates Installing…"));    
-    }  
-    self->current_state = state;
-  }  
-  if (self->current_state != UPGRADE_IN_PROGRESS){
-    g_object_unref (G_OBJECT(self->current_transaction));
-    self->current_transaction = NULL;
-  }
-} 
- 
-static void
-apt_watcher_manage_transactions (AptWatcher* self, gchar* transaction_id)
-{
-    if (self->current_transaction == NULL){
-      self->current_transaction = apt_transaction_new (transaction_id, SIMULATION);
-      g_signal_connect (G_OBJECT(self->current_transaction),
-                        "state-update",
-                        G_CALLBACK(apt_watcher_transaction_state_simulation_update_cb), self);
-    }
-}
-
-static gboolean
-apt_watcher_query_reboot_status (gpointer data)
-{
-  g_return_val_if_fail (APT_IS_WATCHER (data), FALSE);
-  AptWatcher* self = APT_WATCHER (data);
-  
-  GVariant* reboot_result = g_dbus_proxy_get_cached_property (self->proxy,
-                                                             "RebootRequired");
-  gboolean reboot = FALSE;
-  g_variant_get (reboot_result, "b", &reboot);
-  g_debug ("apt_watcher_query_reboot_status: reboot prop = %i", reboot);
-  if (reboot == FALSE){
-    dbusmenu_menuitem_property_set (self->apt_item,
-                                    DBUSMENU_MENUITEM_PROP_LABEL,
-                                    _("Software Up to Date"));
-    dbusmenu_menuitem_property_set (self->apt_item,
-                                    DBUSMENU_MENUITEM_PROP_DISPOSITION,
-                                    DBUSMENU_MENUITEM_DISPOSITION_NORMAL);
-                                    
-  }
-  else{
-    dbusmenu_menuitem_property_set (self->apt_item,
-                                    DBUSMENU_MENUITEM_PROP_LABEL,
-                                    _("Restart to Complete Updates…"));
-    dbusmenu_menuitem_property_set (self->apt_item,
-                                    DBUSMENU_MENUITEM_PROP_DISPOSITION,
-                                    DBUSMENU_MENUITEM_DISPOSITION_ALERT);
-    session_dbus_restart_required (self->session_dbus_interface);
-    self->current_state = RESTART_NEEDED;
-  }
-  self->reboot_query = 0;
-  return FALSE;
-}
-
-static void apt_watcher_signal_cb ( GDBusProxy* proxy,
-                                    gchar* sender_name,
-                                    gchar* signal_name,
-                                    GVariant* parameters,
-                                    gpointer user_data)
-{
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* self = APT_WATCHER (user_data);
-
-  g_variant_ref_sink (parameters);
-  GVariant *value = g_variant_get_child_value (parameters, 0);
-
-  if (g_strcmp0(signal_name, "ActiveTransactionsChanged") == 0){
-    gchar* current = NULL;
-    g_debug ("ActiveTransactionsChanged");
-
-    g_variant_get(value, "s", &current);
-
-    if (g_str_has_prefix (current, "/org/debian/apt/transaction/") == TRUE){
-      g_debug ("ActiveTransactionsChanged - current is %s", current);
-     
-      // Cancel all existing operations.
-      if (self->reboot_query != 0){
-        g_source_remove (self->reboot_query);
-        self->reboot_query = 0;
-      }
-
-      if (self->current_transaction != NULL)
-      {
-        g_object_unref (G_OBJECT(self->current_transaction));
-        self->current_transaction = NULL;
-      }
-
-      self->current_transaction = apt_transaction_new (current, REAL);
-      g_signal_connect (G_OBJECT(self->current_transaction),
-                        "state-update",
-                        G_CALLBACK(apt_watcher_transaction_state_real_update_cb), self);              
-    }
-  }
-  else if (g_strcmp0(signal_name, "PropertyChanged") == 0) 
-  {
-    gchar* prop_name= NULL;
-    GVariant* value = NULL;
-    g_variant_get (parameters, "(sv)", &prop_name, &value);    
-    g_debug ("transaction prop update - prop = %s", prop_name);    
-    
-    if (g_strcmp0 (prop_name, "RebootRequired") == 0){
-      gboolean reboot_required = FALSE;
-      g_variant_get (value, "(b)", &reboot_required); 
-      if (reboot_required){
-        dbusmenu_menuitem_property_set (self->apt_item,
-                                        DBUSMENU_MENUITEM_PROP_LABEL,
-                                        _("Restart to Complete Updates…"));
-        dbusmenu_menuitem_property_set (self->apt_item,
-                                        DBUSMENU_MENUITEM_PROP_DISPOSITION,
-                                        DBUSMENU_MENUITEM_DISPOSITION_ALERT); 
-        self->current_state = RESTART_NEEDED;                                            
-      }   
-    }    
-  } 
-
-  g_variant_unref (value);
-  g_variant_unref (parameters);
-}
-
 AptWatcher* apt_watcher_new (SessionDbus* session_dbus,
                              DbusmenuMenuitem* item)
 {
diff --git a/src/apt-watcher.h b/src/apt-watcher.h
index 6b7d5e1..54d26f5 100644
--- a/src/apt-watcher.h
+++ b/src/apt-watcher.h
@@ -28,6 +28,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <libdbusmenu-gtk/menuitem.h>
 
 #include "session-dbus.h"
+#include "dbus-shared-names.h"
 
 G_BEGIN_DECLS
 
@@ -50,7 +51,6 @@ GType apt_watcher_get_type (void) G_GNUC_CONST;
 
 AptWatcher* apt_watcher_new (SessionDbus* session_dbus,
                              DbusmenuMenuitem* apt_item);
-
 G_END_DECLS
 
 #endif /* _APT_WATCHER_H_ */
-- 
cgit v1.2.3


From 9954c4eb34c9c9c66d3010d7e1dced82b0747518 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 6 Feb 2012 20:28:34 +0000
Subject: we need to talk to dbus to listen for signals from package kit, the
 lib doesnt wrap the signals ...

---
 src/apt-watcher.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 126 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 07b633d..571b1c2 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -37,38 +37,121 @@ struct _AptWatcher
   DbusmenuMenuitem* apt_item;
   AptState current_state;
   PkClient* pkclient;  
+  GCancellable * proxy_cancel;
+  GDBusProxy * proxy;    
 };
                                                                 
 static void apt_watcher_show_apt_dialog (DbusmenuMenuitem* mi,
                                          guint timestamp,
                                          gpointer userdata);
+//static gboolean apt_watcher_start_apt_interaction (gpointer data);
 
 G_DEFINE_TYPE (AptWatcher, apt_watcher, G_TYPE_OBJECT);
 
+static void apt_watcher_signal_cb ( GDBusProxy* proxy,
+                                    gchar* sender_name,
+                                    gchar* signal_name,
+                                    GVariant* parameters,
+                                    gpointer user_data)
+{
+  g_return_if_fail (APT_IS_WATCHER (user_data));
+  //AptWatcher* self = APT_WATCHER (user_data);
+
+  g_variant_ref_sink (parameters);
+  GVariant *value = g_variant_get_child_value (parameters, 0);
+
+  if (g_strcmp0(signal_name, "UpdatesChanged") == 0){
+    g_debug ("UpdatesChanged signal received");
+
+  }
+  else if (g_strcmp0(signal_name, "RestartScheduled") == 0) {
+    g_debug ("RestartScheduled signal received");
+  } 
+
+  g_variant_unref (value);
+  g_variant_unref (parameters);
+}
+
 static void
-apt_watcher_init (AptWatcher *self)
+apt_watcher_on_name_appeared (GDBusConnection *connection,
+                              const gchar     *name,
+                              const gchar     *name_owner,
+                              gpointer         user_data)
 {
-  self->current_state = UP_TO_DATE;
-  self->pkclient = pk_client_new ();
-  /*g_timeout_add_seconds (60,
-                         apt_watcher_start_apt_interaction,
-                         self); */
+  g_return_if_fail (APT_IS_WATCHER (user_data));
+ // AptWatcher* watcher = APT_WATCHER (user_data);
+  
+  g_print ("Name %s on %s is owned by %s\n",
+           name,
+           "the system bus",
+           name_owner);
 }
 
+
 static void
-apt_watcher_finalize (GObject *object)
+apt_watcher_on_name_vanished (GDBusConnection *connection,
+                              const gchar     *name,
+                              gpointer         user_data)
 {
-  g_bus_unwatch_name (watcher_id);  
-  //AptWatcher* self = APT_WATCHER (object);
-           
-	G_OBJECT_CLASS (apt_watcher_parent_class)->finalize (object);
+  g_debug ("Name %s does not exist or has just vanished",
+           name);
+  g_return_if_fail (APT_IS_WATCHER (user_data));
 }
 
 static void
-apt_watcher_class_init (AptWatcherClass *klass)
+fetch_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
 {
-	GObjectClass* object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = apt_watcher_finalize;
+  GError * error = NULL;
+
+  AptWatcher* self = APT_WATCHER(user_data);
+  g_return_if_fail(self != NULL);
+
+  GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
+
+  if (self->proxy_cancel != NULL) {
+    g_object_unref(self->proxy_cancel);
+    self->proxy_cancel = NULL;
+  }
+
+  if (error != NULL) {
+    g_warning("Could not grab DBus proxy for %s: %s",
+               "org.debian.apt", error->message);
+    g_error_free(error);
+    return;
+  }
+
+  self->proxy = proxy;
+  // Set up the watch.
+  watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM,
+                                 "org.freedesktop.PackageKit",
+                                 G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                 apt_watcher_on_name_appeared,
+                                 apt_watcher_on_name_vanished,
+                                 self,
+                                 NULL);
+  
+  g_signal_connect (self->proxy,
+                    "g-signal",
+                    G_CALLBACK(apt_watcher_signal_cb),
+                    self);   
+}
+
+
+static gboolean 
+apt_watcher_start_apt_interaction (gpointer data)
+{
+  g_return_val_if_fail (APT_IS_WATCHER (data), FALSE);
+  AptWatcher* self = APT_WATCHER (data);
+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+                            G_DBUS_PROXY_FLAGS_NONE,
+                            NULL,
+                            "org.freedesktop.PackageKit",
+                            "/org/freedesktop/PackageKit",
+                            "org.freedesktop.PackageKit",
+                            self->proxy_cancel,
+                            fetch_proxy_cb,
+                            self);
+  return FALSE;    
 }
 
 
@@ -103,6 +186,35 @@ apt_watcher_show_apt_dialog (DbusmenuMenuitem * mi,
   }   
 }
 
+static void
+apt_watcher_init (AptWatcher *self)
+{
+  self->current_state = UP_TO_DATE;
+  self->pkclient = pk_client_new ();
+  g_timeout_add_seconds (60,
+                         apt_watcher_start_apt_interaction,
+                         self); 
+}
+
+static void
+apt_watcher_finalize (GObject *object)
+{
+  g_bus_unwatch_name (watcher_id);  
+  AptWatcher* self = APT_WATCHER (object);
+           
+  if (self->proxy != NULL)
+    g_object_unref (self->proxy);
+         
+  G_OBJECT_CLASS (apt_watcher_parent_class)->finalize (object);
+}
+
+static void
+apt_watcher_class_init (AptWatcherClass *klass)
+{
+  GObjectClass* object_class = G_OBJECT_CLASS (klass);
+  object_class->finalize = apt_watcher_finalize;
+}
+
 AptWatcher* apt_watcher_new (SessionDbus* session_dbus,
                              DbusmenuMenuitem* item)
 {
-- 
cgit v1.2.3


From e0c43e050f0ec37d22111cc90b7fa1dc7f5c0da8 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 6 Feb 2012 21:07:57 +0000
Subject: query for updates half complete

---
 src/apt-watcher.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 571b1c2..0165bf0 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -41,13 +41,16 @@ struct _AptWatcher
   GDBusProxy * proxy;    
 };
                                                                 
-static void apt_watcher_show_apt_dialog (DbusmenuMenuitem* mi,
-                                         guint timestamp,
-                                         gpointer userdata);
-//static gboolean apt_watcher_start_apt_interaction (gpointer data);
-
 G_DEFINE_TYPE (AptWatcher, apt_watcher, G_TYPE_OBJECT);
 
+static void
+get_updates_complete (GObject *source_object,
+                      GAsyncResult *res,
+                      gpointer user_data)
+{
+  
+}
+
 static void apt_watcher_signal_cb ( GDBusProxy* proxy,
                                     gchar* sender_name,
                                     gchar* signal_name,
@@ -55,14 +58,19 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
                                     gpointer user_data)
 {
   g_return_if_fail (APT_IS_WATCHER (user_data));
-  //AptWatcher* self = APT_WATCHER (user_data);
+  AptWatcher* self = APT_WATCHER (user_data);
 
   g_variant_ref_sink (parameters);
   GVariant *value = g_variant_get_child_value (parameters, 0);
 
   if (g_strcmp0(signal_name, "UpdatesChanged") == 0){
     g_debug ("UpdatesChanged signal received");
-
+    self->pkclient = pk_client_new ();
+    pk_client_get_updates_async (self->pkclient, 
+                                 PK_FILTER_ENUM_NONE,
+                                 NULL, NULL, NULL,
+                                 get_updates_complete,
+                                 self);
   }
   else if (g_strcmp0(signal_name, "RestartScheduled") == 0) {
     g_debug ("RestartScheduled signal received");
@@ -190,7 +198,6 @@ static void
 apt_watcher_init (AptWatcher *self)
 {
   self->current_state = UP_TO_DATE;
-  self->pkclient = pk_client_new ();
   g_timeout_add_seconds (60,
                          apt_watcher_start_apt_interaction,
                          self); 
-- 
cgit v1.2.3


From bf53f6ba5ca03a9cf6617eb09046ad5cc2e564ad Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 7 Feb 2012 11:37:06 +0000
Subject: fetching available packages

---
 src/apt-watcher.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 0165bf0..41ed8fc 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -30,6 +30,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static guint watcher_id;
 
+// TODO 
+// Get it working and then remove the pkclient pointer in the priv 
+// it's not needed. 
+
 struct _AptWatcher
 {
 	GObject parent_instance;
@@ -38,7 +42,7 @@ struct _AptWatcher
   AptState current_state;
   PkClient* pkclient;  
   GCancellable * proxy_cancel;
-  GDBusProxy * proxy;    
+  GDBusProxy * proxy;
 };
                                                                 
 G_DEFINE_TYPE (AptWatcher, apt_watcher, G_TYPE_OBJECT);
@@ -48,7 +52,23 @@ get_updates_complete (GObject *source_object,
                       GAsyncResult *res,
                       gpointer user_data)
 {
+  g_return_if_fail (APT_IS_WATCHER (user_data));
+  //AptWatcher* self = APT_WATCHER (user_data);
+
+  g_print ("Get updates complete");
+  PkResults * results;
+  
+  results = pk_client_generic_finish (PK_CLIENT(source_object), res, NULL);
   
+  if (results == NULL){
+    g_warning ("Unable to query for updates - results were NULL ?");
+    return;
+  }
+
+  GPtrArray *packages;
+  packages = pk_results_get_package_array (results);
+  g_ptr_array_unref (packages);
+  g_object_unref (results);
 }
 
 static void apt_watcher_signal_cb ( GDBusProxy* proxy,
@@ -65,11 +85,12 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
 
   if (g_strcmp0(signal_name, "UpdatesChanged") == 0){
     g_debug ("UpdatesChanged signal received");
-    self->pkclient = pk_client_new ();
+    if (self->pkclient == NULL)
+      self->pkclient = pk_client_new ();
     pk_client_get_updates_async (self->pkclient, 
                                  PK_FILTER_ENUM_NONE,
                                  NULL, NULL, NULL,
-                                 get_updates_complete,
+                                 (GAsyncReadyCallback)get_updates_complete,
                                  self);
   }
   else if (g_strcmp0(signal_name, "RestartScheduled") == 0) {
@@ -198,7 +219,7 @@ static void
 apt_watcher_init (AptWatcher *self)
 {
   self->current_state = UP_TO_DATE;
-  g_timeout_add_seconds (60,
+  g_timeout_add_seconds (1,
                          apt_watcher_start_apt_interaction,
                          self); 
 }
@@ -211,6 +232,8 @@ apt_watcher_finalize (GObject *object)
            
   if (self->proxy != NULL)
     g_object_unref (self->proxy);
+  if (self->pkclient != NULL)
+    g_object_unref (self->pkclient);
          
   G_OBJECT_CLASS (apt_watcher_parent_class)->finalize (object);
 }
-- 
cgit v1.2.3


From 6e585e5487560785caaaf129a1084fd94313ce11 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 7 Feb 2012 14:35:29 +0000
Subject: apt watcher updates

---
 src/apt-watcher.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 41ed8fc..eed0080 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -67,6 +67,11 @@ get_updates_complete (GObject *source_object,
 
   GPtrArray *packages;
   packages = pk_results_get_package_array (results);
+  g_print ("Packages count = %i",
+            packages->len);
+  if (packages->len > 0){
+    
+  }
   g_ptr_array_unref (packages);
   g_object_unref (results);
 }
@@ -135,10 +140,10 @@ fetch_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
   AptWatcher* self = APT_WATCHER(user_data);
   g_return_if_fail(self != NULL);
 
-  GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
+  GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
 
   if (self->proxy_cancel != NULL) {
-    g_object_unref(self->proxy_cancel);
+    g_object_unref (self->proxy_cancel);
     self->proxy_cancel = NULL;
   }
 
@@ -165,7 +170,6 @@ fetch_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
                     self);   
 }
 
-
 static gboolean 
 apt_watcher_start_apt_interaction (gpointer data)
 {
-- 
cgit v1.2.3


From e856eb999de074536d8bdf634f519f3947daf7c3 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 7 Feb 2012 15:49:20 +0000
Subject: no need to hold on to a reference to a pkclient instance

---
 src/apt-watcher.c | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index eed0080..bcf6c97 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -40,13 +40,13 @@ struct _AptWatcher
   SessionDbus* session_dbus_interface;
   DbusmenuMenuitem* apt_item;
   AptState current_state;
-  PkClient* pkclient;  
   GCancellable * proxy_cancel;
   GDBusProxy * proxy;
 };
                                                                 
 G_DEFINE_TYPE (AptWatcher, apt_watcher, G_TYPE_OBJECT);
 
+
 static void
 get_updates_complete (GObject *source_object,
                       GAsyncResult *res,
@@ -56,7 +56,7 @@ get_updates_complete (GObject *source_object,
   //AptWatcher* self = APT_WATCHER (user_data);
 
   g_print ("Get updates complete");
-  PkResults * results;
+  PkResults *results;
   
   results = pk_client_generic_finish (PK_CLIENT(source_object), res, NULL);
   
@@ -70,10 +70,25 @@ get_updates_complete (GObject *source_object,
   g_print ("Packages count = %i",
             packages->len);
   if (packages->len > 0){
-    
+    g_print ("Apparently we have updates available");    
   }
   g_ptr_array_unref (packages);
   g_object_unref (results);
+  g_object_unref (source_object);
+}
+
+static void
+apt_watcher_check_for_updates (AptWatcher* self)
+{
+    g_debug ("UpdatesChanged signal received");
+    PkClient* client;
+    client = pk_client_new ();
+
+    pk_client_get_updates_async (client, 
+                                 PK_FILTER_ENUM_NONE,
+                                 NULL, NULL, NULL,
+                                 (GAsyncReadyCallback)get_updates_complete,
+                                 self);  
 }
 
 static void apt_watcher_signal_cb ( GDBusProxy* proxy,
@@ -89,14 +104,8 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
   GVariant *value = g_variant_get_child_value (parameters, 0);
 
   if (g_strcmp0(signal_name, "UpdatesChanged") == 0){
-    g_debug ("UpdatesChanged signal received");
-    if (self->pkclient == NULL)
-      self->pkclient = pk_client_new ();
-    pk_client_get_updates_async (self->pkclient, 
-                                 PK_FILTER_ENUM_NONE,
-                                 NULL, NULL, NULL,
-                                 (GAsyncReadyCallback)get_updates_complete,
-                                 self);
+    g_print ("updates changed signal received");
+    apt_watcher_check_for_updates (self);
   }
   else if (g_strcmp0(signal_name, "RestartScheduled") == 0) {
     g_debug ("RestartScheduled signal received");
@@ -162,8 +171,7 @@ fetch_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
                                  apt_watcher_on_name_appeared,
                                  apt_watcher_on_name_vanished,
                                  self,
-                                 NULL);
-  
+                                 NULL);  
   g_signal_connect (self->proxy,
                     "g-signal",
                     G_CALLBACK(apt_watcher_signal_cb),
@@ -184,6 +192,7 @@ apt_watcher_start_apt_interaction (gpointer data)
                             self->proxy_cancel,
                             fetch_proxy_cb,
                             self);
+  apt_watcher_check_for_updates (self);
   return FALSE;    
 }
 
@@ -236,8 +245,6 @@ apt_watcher_finalize (GObject *object)
            
   if (self->proxy != NULL)
     g_object_unref (self->proxy);
-  if (self->pkclient != NULL)
-    g_object_unref (self->pkclient);
          
   G_OBJECT_CLASS (apt_watcher_parent_class)->finalize (object);
 }
-- 
cgit v1.2.3


From 3c560ddcaeb71953c7dfecf2acfa11aa77b0e3d9 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Wed, 8 Feb 2012 12:29:49 +0000
Subject: pk kit compat layer seems to be sane

---
 src/apt-watcher.c | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index bcf6c97..cdb3ce9 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -33,7 +33,6 @@ static guint watcher_id;
 // TODO 
 // Get it working and then remove the pkclient pointer in the priv 
 // it's not needed. 
-
 struct _AptWatcher
 {
 	GObject parent_instance;
@@ -53,9 +52,8 @@ get_updates_complete (GObject *source_object,
                       gpointer user_data)
 {
   g_return_if_fail (APT_IS_WATCHER (user_data));
-  //AptWatcher* self = APT_WATCHER (user_data);
+  AptWatcher* self = APT_WATCHER (user_data);
 
-  g_print ("Get updates complete");
   PkResults *results;
   
   results = pk_client_generic_finish (PK_CLIENT(source_object), res, NULL);
@@ -67,10 +65,26 @@ get_updates_complete (GObject *source_object,
 
   GPtrArray *packages;
   packages = pk_results_get_package_array (results);
-  g_print ("Packages count = %i",
-            packages->len);
+
+  const gchar* disposition;
+  disposition = dbusmenu_menuitem_property_get (self->apt_item,
+                                                DBUSMENU_MENUITEM_PROP_DISPOSITION);
+  gboolean do_update;
+  do_update = g_strcmp0 (disposition, DBUSMENU_MENUITEM_DISPOSITION_ALERT) != 0;                                       
+
   if (packages->len > 0){
-    g_print ("Apparently we have updates available");    
+    g_print ("Apparently we have updates available - change dbmitem %i", do_update);   
+      if (do_update) 
+        dbusmenu_menuitem_property_set (self->apt_item,
+                                        DBUSMENU_MENUITEM_PROP_LABEL,
+                                        _("Updates Available…"));    
+  }
+  else{
+    g_print ("No updates available - change dbmitem - %i", do_update);   
+      if (do_update)
+        dbusmenu_menuitem_property_set (self->apt_item,
+                                        DBUSMENU_MENUITEM_PROP_LABEL,
+                                        _("Software Up to Date"));       
   }
   g_ptr_array_unref (packages);
   g_object_unref (results);
@@ -80,7 +94,6 @@ get_updates_complete (GObject *source_object,
 static void
 apt_watcher_check_for_updates (AptWatcher* self)
 {
-    g_debug ("UpdatesChanged signal received");
     PkClient* client;
     client = pk_client_new ();
 
@@ -102,13 +115,19 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
 
   g_variant_ref_sink (parameters);
   GVariant *value = g_variant_get_child_value (parameters, 0);
-
+  g_debug ("apt-watcher-signal cb signal name - %s", signal_name);
   if (g_strcmp0(signal_name, "UpdatesChanged") == 0){
-    g_print ("updates changed signal received");
+    g_debug ("updates changed signal received");
     apt_watcher_check_for_updates (self);
   }
   else if (g_strcmp0(signal_name, "RestartScheduled") == 0) {
     g_debug ("RestartScheduled signal received");
+    dbusmenu_menuitem_property_set (self->apt_item,
+                                    DBUSMENU_MENUITEM_PROP_LABEL,
+                                    _("Restart to Complete Updates…"));
+    dbusmenu_menuitem_property_set (self->apt_item,
+                                    DBUSMENU_MENUITEM_PROP_DISPOSITION,
+                                    DBUSMENU_MENUITEM_DISPOSITION_ALERT);     
   } 
 
   g_variant_unref (value);
-- 
cgit v1.2.3


From d4162d24e4bdee56df9bf6815207cf0ecf15fed3 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Wed, 8 Feb 2012 16:37:31 +0000
Subject: get rid of the transaction as we don't need to worry about updates
 installing state

---
 src/Makefile.am       |   4 +-
 src/apt-transaction.c | 263 --------------------------------------------------
 src/apt-transaction.h |  49 ----------
 src/apt-watcher.c     |   9 +-
 4 files changed, 5 insertions(+), 320 deletions(-)
 delete mode 100644 src/apt-transaction.c
 delete mode 100644 src/apt-transaction.h

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index afee66c..67a1cb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,9 +114,7 @@ indicator_session_service_SOURCES = \
 if BUILD_APT
 indicator_session_service_SOURCES += \
 	apt-watcher.h \
-	apt-watcher.c \
-	apt-transaction.h \
-	apt-transaction.c
+	apt-watcher.c 
 endif
 
 indicator_session_service_CFLAGS = \
diff --git a/src/apt-transaction.c b/src/apt-transaction.c
deleted file mode 100644
index 2b3f5a4..0000000
--- a/src/apt-transaction.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Conor Curran <conor.curran@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <gio/gio.h>
-
-#include "apt-transaction.h"
-#include "dbus-shared-names.h"
-
-static void apt_transaction_investigate (AptTransaction* self);
-static void apt_transaction_simulate_transaction_cb (GObject * obj,
-                                                     GAsyncResult * res,
-                                                     gpointer user_data);
-static void apt_transaction_receive_signal (GDBusProxy * proxy,
-                                            gchar * sender_name,
-                                            gchar * signal_name,
-                                            GVariant * parameters,
-                                            gpointer user_data);
-static void apt_transaction_finish_proxy_setup (GObject *source_object,
-                                                GAsyncResult *res,
-                                                gpointer user_data);
-
-struct _AptTransaction
-{
-	GObject       parent_instance;
-	GDBusProxy *  proxy;    
-	GCancellable * proxy_cancel;  
-  gchar*        id;
-  TransactionType type;
-};
-
-enum {
-  UPDATE,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (AptTransaction, apt_transaction, G_TYPE_OBJECT);
-
-static void
-apt_transaction_init (AptTransaction *self)
-{
-  self->proxy = NULL;
-  self->id = NULL;
-  self->proxy_cancel = g_cancellable_new();
-}
-
-static void
-apt_transaction_finalize (GObject *object)
-{
-  AptTransaction* self = APT_TRANSACTION(object);
-  g_signal_handlers_disconnect_by_func (G_OBJECT (self->proxy),
-                                        G_CALLBACK (apt_transaction_receive_signal),
-                                        self);
-  if (self->proxy != NULL){
-    g_object_unref (self->proxy);
-    self->proxy = NULL;
-  }
-  g_free (self->id);
-	G_OBJECT_CLASS (apt_transaction_parent_class)->finalize (object);
-}
-
-static void
-apt_transaction_class_init (AptTransactionClass *klass)
-{
-	GObjectClass* object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = apt_transaction_finalize;
-
-  signals[UPDATE] =  g_signal_new("state-update",
-                                   G_TYPE_FROM_CLASS (klass),
-                                   G_SIGNAL_RUN_LAST,
-                                   0,
-                                   NULL, NULL,
-                                   g_cclosure_marshal_VOID__INT,
-                                   G_TYPE_NONE, 1, G_TYPE_INT);  
-}
-
-// TODO: you don't need this additional helper
-// Just GObject properties properly
-static void
-apt_transaction_investigate (AptTransaction* self)
-{
-  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-                            G_DBUS_PROXY_FLAGS_NONE,
-                            NULL,
-                            "org.debian.apt",
-                            self->id,
-                            "org.debian.apt.transaction",
-                            self->proxy_cancel,
-                            apt_transaction_finish_proxy_setup,
-                            self);
-}
-
-static void
-apt_transaction_finish_proxy_setup (GObject *source_object,
-                                    GAsyncResult *res,
-                                    gpointer user_data)
-{
-  g_return_if_fail (APT_IS_TRANSACTION (user_data));
-  AptTransaction* self = APT_TRANSACTION(user_data);      
-	GError * error = NULL;
-
-	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
-
-	if (self->proxy_cancel != NULL) {
-		g_object_unref(self->proxy_cancel);
-		self->proxy_cancel = NULL;
-	}
-
-	if (error != NULL) {
-		g_warning("Could not grab DBus proxy for %s: %s",
-               "org.debian.apt", error->message);
-		g_error_free(error);
-		return;
-	}
-  
-  self->proxy = proxy;
-
-  g_signal_connect (G_OBJECT(self->proxy),
-                    "g-signal",
-                    G_CALLBACK (apt_transaction_receive_signal),
-                    self);    
-
-  if (self->type == SIMULATION){
-    g_dbus_proxy_call (self->proxy,
-                       "Simulate",
-                       NULL,
-                       G_DBUS_CALL_FLAGS_NONE,
-                       -1,
-                       NULL,
-                       apt_transaction_simulate_transaction_cb,
-                       self);                                                                                        
-  }                       
-}
-
-static void
-apt_transaction_receive_signal (GDBusProxy * proxy,
-                                gchar * sender_name,
-                                gchar * signal_name,
-                                GVariant * parameters,
-                                gpointer user_data)
-{
-  g_return_if_fail (APT_IS_TRANSACTION (user_data));
-  AptTransaction* self = APT_TRANSACTION(user_data);
-  AptState current_state = DONT_KNOW;
-  
-  if (g_strcmp0(signal_name, "PropertyChanged") == 0) 
-  {
-    gchar* prop_name= NULL;
-    GVariant* value = NULL;
-    g_variant_get (parameters, "(sv)", &prop_name, &value);    
-    g_debug ("transaction prop update - prop = %s", prop_name);
-    
-    if (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING) == TRUE){
-      gchar* key = NULL;
-      g_variant_get (value, "s", &key);
-      g_debug ("transaction prop update - value = %s", key);
-    }
-    
-    if (g_strcmp0 (prop_name, "Dependencies") == 0){
-            
-      gchar** install = NULL;
-      gchar** reinstall = NULL;
-      gchar** remove = NULL;
-      gchar** purge = NULL;
-      gchar** upgrade = NULL;
-      gchar** downgrade = NULL;
-      gchar** keep = NULL;
-      g_variant_get (value, "(asasasasasasas)", &install, 
-                     &reinstall, &remove, &purge, &upgrade, &downgrade,
-                     &keep);      
-      /*                     
-      g_debug ("upgrade package length %i", g_strv_length(upgrade));                
-      g_debug ("install package length %i", g_strv_length(install));
-      g_debug ("reinstall package length %i", g_strv_length(reinstall));
-      g_debug ("remove package length %i", g_strv_length(remove));
-      g_debug ("purge package length %i", g_strv_length(purge));
-      */
-      gboolean upgrade_needed = (g_strv_length(upgrade) > 1) ||
-                                (g_strv_length(install) > 1) ||
-                                (g_strv_length(reinstall) > 1) ||
-                                (g_strv_length(remove) > 1) ||
-                                (g_strv_length(purge) > 1);
-      if (upgrade_needed == TRUE){
-        current_state = UPDATES_AVAILABLE;        
-      }
-      else{
-        current_state = UP_TO_DATE;
-      }
-    }
-    if (self->type == REAL)
-    {
-      GVariant* role = g_dbus_proxy_get_cached_property (self->proxy,
-                                                         "Role");
-      if (g_variant_is_of_type (role, G_VARIANT_TYPE_STRING) == TRUE){
-        gchar* current_role = NULL;
-        g_variant_get (role, "s", &current_role);
-        //g_debug ("Current transaction role = %s", current_role);
-        if (g_strcmp0 (current_role, "role-commit-packages") == 0 ||
-            g_strcmp0 (current_role, "role-upgrade-system") == 0){
-          g_debug ("UPGRADE IN PROGRESS");
-          current_state = UPGRADE_IN_PROGRESS;                        
-        }
-      }
-    } 
-  }
-  else if (g_strcmp0(signal_name, "Finished") == 0) 
-  {
-    g_debug ("TRANSACTION Finished");
-    current_state = FINISHED;
-  }
-  // Finally send out the state update  
-  if (current_state != DONT_KNOW){
-    g_signal_emit (self,
-                   signals[UPDATE],
-                   0,
-                   current_state);
-  }
-}
-
-static void
-apt_transaction_simulate_transaction_cb (GObject * obj,
-                                         GAsyncResult * res,
-                                         gpointer user_data)
-{
-	GError * error = NULL;
-	if (error != NULL) {
-    g_warning ("unable to complete the simulate call");
-    g_error_free (error);
-		return;
-	}
-}
-TransactionType 
-apt_transaction_get_transaction_type (AptTransaction* self)
-{
-  return self->type;
-}
-
-AptTransaction* apt_transaction_new (gchar* transaction_id, TransactionType t)
-{
-  AptTransaction* tr = g_object_new (APT_TYPE_TRANSACTION, NULL);
-  tr->id = transaction_id;
-  tr->type = t;
-  g_debug ("Apt transaction new id = %s", tr->id);
-  apt_transaction_investigate (tr);
-  return tr;
-}
diff --git a/src/apt-transaction.h b/src/apt-transaction.h
deleted file mode 100644
index 9e4370d..0000000
--- a/src/apt-transaction.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Conor Curran <conor.curran@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _APT_TRANSACTION_H_
-#define _APT_TRANSACTION_H_
-
-#include <glib-object.h>
-#include "dbus-shared-names.h"
-
-G_BEGIN_DECLS
-
-#define APT_TYPE_TRANSACTION             (apt_transaction_get_type ())
-#define APT_TRANSACTION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), APT_TYPE_TRANSACTION, AptTransaction))
-#define APT_TRANSACTION_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), APT_TYPE_TRANSACTION, AptTransactionClass))
-#define APT_IS_TRANSACTION(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APT_TYPE_TRANSACTION))
-#define APT_IS_TRANSACTION_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), APT_TYPE_TRANSACTION))
-#define APT_TRANSACTION_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), APT_TYPE_TRANSACTION, AptTransactionClass))
-
-typedef struct _AptTransactionClass AptTransactionClass;
-typedef struct _AptTransaction AptTransaction;
-
-struct _AptTransactionClass
-{
-	GObjectClass parent_class;
-};
-
-AptTransaction* apt_transaction_new (gchar* transaction_id, TransactionType t);
-TransactionType apt_transaction_get_transaction_type (AptTransaction* self);
-GType apt_transaction_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* _APT_TRANSACTION_H_ */
diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index cdb3ce9..cab2d8b 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -30,9 +30,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static guint watcher_id;
 
-// TODO 
-// Get it working and then remove the pkclient pointer in the priv 
-// it's not needed. 
 struct _AptWatcher
 {
 	GObject parent_instance;
@@ -114,7 +111,6 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
   AptWatcher* self = APT_WATCHER (user_data);
 
   g_variant_ref_sink (parameters);
-  GVariant *value = g_variant_get_child_value (parameters, 0);
   g_debug ("apt-watcher-signal cb signal name - %s", signal_name);
   if (g_strcmp0(signal_name, "UpdatesChanged") == 0){
     g_debug ("updates changed signal received");
@@ -129,8 +125,11 @@ 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 (value);
+  }  
   g_variant_unref (parameters);
 }
 
-- 
cgit v1.2.3


From 4145c29279197d5985d348fbe2ef219a4c015a11 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Wed, 8 Feb 2012 17:23:19 +0000
Subject: correct conflict

---
 src/user-widget.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/user-widget.c b/src/user-widget.c
index 8388ec5..33b9e40 100644
--- a/src/user-widget.c
+++ b/src/user-widget.c
@@ -136,7 +136,13 @@ user_widget_init (UserWidget *self)
   gtk_misc_set_padding (GTK_MISC(priv->user_image),0, 4.0);
   
   priv->user_name = gtk_label_new ("");
+
+#if HAVE_GTK3
   priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+#else
+  priv->container = gtk_hbox_new (FALSE, 0);
+#endif
+
 	priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in",
                                                    GTK_ICON_SIZE_MENU);
  	gtk_misc_set_alignment(GTK_MISC(priv->tick_icon), 1.0, 0.5);
-- 
cgit v1.2.3


From 2890929b32c38c8c99ce381dd20b4df30d24f2ad Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
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(-)

(limited to 'src')

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 <http://www.gnu.org/licenses/>.
 #include <libdbusmenu-gtk/menuitem.h>
 
 #include "session-dbus.h"
-#include "dbus-shared-names.h"
 
 G_BEGIN_DECLS
 
-- 
cgit v1.2.3


From 9dec8f6fe22ccd4c52dd1d7e9fd925b87c2830c7 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Fri, 10 Feb 2012 18:33:14 +1100
Subject: Don't lock the session when switching to another one - something else
 (ConsoleKit?) already does this and locks it regardless of if the setting has
 been configured. By explicitly doing the lock it means we can't override it
 inside GNOME screensaver to switch to the greeter instead, so this patch
 removes the code.

---
 src/user-menu-mgr.c | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 3f4bdc4..7aad2af 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -285,29 +285,11 @@ check_new_session ()
 	return TRUE;
 }
 
-/* Check to see if the lockdown key is protecting from
-   locking the screen.  If not, lock it. */
-static void
-lock_if_possible (void) {
-	ensure_settings_client ();
-
-	if (!g_settings_get_boolean (settings, LOCKDOWN_KEY_SCREENSAVER)) {
-		lock_screen(NULL, 0, NULL);
-	}
-
-	return;
-}
-
-
 /* Starts a new generic session */
 static void
 activate_new_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
 {
-	lock_if_possible();
-
-  users_service_dbus_show_greeter (USERS_SERVICE_DBUS(user_data));
-
-	return;
+	users_service_dbus_show_greeter (USERS_SERVICE_DBUS(user_data));
 }
 
 /* Activates a session for a particular user. */
@@ -317,8 +299,6 @@ activate_user_session (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data
   UserData *user = (UserData *)user_data;
   UsersServiceDbus *service = user->service;
 
-  lock_if_possible();
-
   users_service_dbus_activate_user_session (service, user);
 }
 
@@ -406,11 +386,7 @@ activate_guest_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_da
   UserMenuMgr* user_mgr = USER_MENU_MGR(user_data);  
   UsersServiceDbus *service = user_mgr->users_dbus_interface;
 
-	lock_if_possible();
-  
-  if (users_service_dbus_activate_guest_session(service)) {
-    return;
-  }
+  users_service_dbus_activate_guest_session(service);
 }
 
 
-- 
cgit v1.2.3


From 10923a8e6c73b0dbee321c33d4b40f1e90c8dd59 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 10 Feb 2012 14:50:35 -0500
Subject: Import upstream version 0.3.91

---
 src/Makefile.am       |   4 +-
 src/Makefile.in       | 244 +++++++++++-------------
 src/apt-transaction.c | 263 --------------------------
 src/apt-transaction.h |  49 -----
 src/apt-watcher.c     | 506 +++++++++++++++-----------------------------------
 src/apt-watcher.h     |   1 -
 src/user-widget.c     |   2 +
 7 files changed, 255 insertions(+), 814 deletions(-)
 delete mode 100644 src/apt-transaction.c
 delete mode 100644 src/apt-transaction.h

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index afee66c..67a1cb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,9 +114,7 @@ indicator_session_service_SOURCES = \
 if BUILD_APT
 indicator_session_service_SOURCES += \
 	apt-watcher.h \
-	apt-watcher.c \
-	apt-transaction.h \
-	apt-transaction.c
+	apt-watcher.c 
 endif
 
 indicator_session_service_CFLAGS = \
diff --git a/src/Makefile.in b/src/Makefile.in
index 5e973fb..6efb4de 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -41,14 +41,15 @@ libexec_PROGRAMS = indicator-session-service$(EXEEXT) $(am__EXEEXT_1)
 
 @BUILD_APT_TRUE@am__append_2 = \
 @BUILD_APT_TRUE@	apt-watcher.h \
-@BUILD_APT_TRUE@	apt-watcher.c \
-@BUILD_APT_TRUE@	apt-transaction.h \
-@BUILD_APT_TRUE@	apt-transaction.c
+@BUILD_APT_TRUE@	apt-watcher.c 
 
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -76,6 +77,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(sessionlibdir)" \
 	"$(DESTDIR)$(libexecdir)"
 LTLIBRARIES = $(sessionlib_LTLIBRARIES)
@@ -84,8 +91,8 @@ libsession_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libsession_la_OBJECTS = libsession_la-indicator-session.lo \
 	libsession_la-user-widget.lo
 libsession_la_OBJECTS = $(am_libsession_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 libsession_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsession_la_CFLAGS) \
@@ -110,10 +117,8 @@ am__indicator_session_service_SOURCES_DIST = lock-helper.c \
 	gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \
 	users-service-dbus.h users-service-dbus.c user-menu-mgr.h \
 	user-menu-mgr.c device-menu-mgr.h device-menu-mgr.c udev-mgr.h \
-	udev-mgr.c sane-rules.h apt-watcher.h apt-watcher.c \
-	apt-transaction.h apt-transaction.c
-@BUILD_APT_TRUE@am__objects_1 = indicator_session_service-apt-watcher.$(OBJEXT) \
-@BUILD_APT_TRUE@	indicator_session_service-apt-transaction.$(OBJEXT)
+	udev-mgr.c sane-rules.h apt-watcher.h apt-watcher.c
+@BUILD_APT_TRUE@am__objects_1 = indicator_session_service-apt-watcher.$(OBJEXT)
 am_indicator_session_service_OBJECTS =  \
 	indicator_session_service-lock-helper.$(OBJEXT) \
 	indicator_session_service-session-service.$(OBJEXT) \
@@ -141,21 +146,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libsession_la_SOURCES) $(gtk_logout_helper_SOURCES) \
 	$(indicator_session_service_SOURCES)
@@ -219,6 +224,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -302,6 +311,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -482,7 +493,7 @@ clean-sessionlibLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libsession.la: $(libsession_la_OBJECTS) $(libsession_la_DEPENDENCIES) 
+libsession.la: $(libsession_la_OBJECTS) $(libsession_la_DEPENDENCIES) $(EXTRA_libsession_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libsession_la_LINK) -rpath $(sessionlibdir) $(libsession_la_OBJECTS) $(libsession_la_LIBADD) $(LIBS)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -527,10 +538,10 @@ clean-libexecPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-gtk-logout-helper$(EXEEXT): $(gtk_logout_helper_OBJECTS) $(gtk_logout_helper_DEPENDENCIES) 
+gtk-logout-helper$(EXEEXT): $(gtk_logout_helper_OBJECTS) $(gtk_logout_helper_DEPENDENCIES) $(EXTRA_gtk_logout_helper_DEPENDENCIES) 
 	@rm -f gtk-logout-helper$(EXEEXT)
 	$(AM_V_CCLD)$(gtk_logout_helper_LINK) $(gtk_logout_helper_OBJECTS) $(gtk_logout_helper_LDADD) $(LIBS)
-indicator-session-service$(EXEEXT): $(indicator_session_service_OBJECTS) $(indicator_session_service_DEPENDENCIES) 
+indicator-session-service$(EXEEXT): $(indicator_session_service_OBJECTS) $(indicator_session_service_DEPENDENCIES) $(EXTRA_indicator_session_service_DEPENDENCIES) 
 	@rm -f indicator-session-service$(EXEEXT)
 	$(AM_V_CCLD)$(indicator_session_service_LINK) $(indicator_session_service_OBJECTS) $(indicator_session_service_LDADD) $(LIBS)
 
@@ -543,7 +554,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_logout_helper-dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_logout_helper-gtk-logout-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_logout_helper-settings-helper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-apt-transaction.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-apt-watcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-device-menu-mgr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-gen-session-dbus.xml.Po@am__quote@
@@ -560,266 +570,219 @@ distclean-compile:
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libsession_la-indicator-session.lo: indicator-session.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsession_la_CFLAGS) $(CFLAGS) -MT libsession_la-indicator-session.lo -MD -MP -MF $(DEPDIR)/libsession_la-indicator-session.Tpo -c -o libsession_la-indicator-session.lo `test -f 'indicator-session.c' || echo '$(srcdir)/'`indicator-session.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsession_la-indicator-session.Tpo $(DEPDIR)/libsession_la-indicator-session.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='indicator-session.c' object='libsession_la-indicator-session.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-session.c' object='libsession_la-indicator-session.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsession_la_CFLAGS) $(CFLAGS) -c -o libsession_la-indicator-session.lo `test -f 'indicator-session.c' || echo '$(srcdir)/'`indicator-session.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsession_la_CFLAGS) $(CFLAGS) -c -o libsession_la-indicator-session.lo `test -f 'indicator-session.c' || echo '$(srcdir)/'`indicator-session.c
 
 libsession_la-user-widget.lo: user-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsession_la_CFLAGS) $(CFLAGS) -MT libsession_la-user-widget.lo -MD -MP -MF $(DEPDIR)/libsession_la-user-widget.Tpo -c -o libsession_la-user-widget.lo `test -f 'user-widget.c' || echo '$(srcdir)/'`user-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsession_la-user-widget.Tpo $(DEPDIR)/libsession_la-user-widget.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='user-widget.c' object='libsession_la-user-widget.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='user-widget.c' object='libsession_la-user-widget.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsession_la_CFLAGS) $(CFLAGS) -c -o libsession_la-user-widget.lo `test -f 'user-widget.c' || echo '$(srcdir)/'`user-widget.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsession_la_CFLAGS) $(CFLAGS) -c -o libsession_la-user-widget.lo `test -f 'user-widget.c' || echo '$(srcdir)/'`user-widget.c
 
 gtk_logout_helper-gtk-logout-helper.o: gtk-logout-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-gtk-logout-helper.o -MD -MP -MF $(DEPDIR)/gtk_logout_helper-gtk-logout-helper.Tpo -c -o gtk_logout_helper-gtk-logout-helper.o `test -f 'gtk-logout-helper.c' || echo '$(srcdir)/'`gtk-logout-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-gtk-logout-helper.Tpo $(DEPDIR)/gtk_logout_helper-gtk-logout-helper.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk-logout-helper.c' object='gtk_logout_helper-gtk-logout-helper.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtk-logout-helper.c' object='gtk_logout_helper-gtk-logout-helper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-gtk-logout-helper.o `test -f 'gtk-logout-helper.c' || echo '$(srcdir)/'`gtk-logout-helper.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-gtk-logout-helper.o `test -f 'gtk-logout-helper.c' || echo '$(srcdir)/'`gtk-logout-helper.c
 
 gtk_logout_helper-gtk-logout-helper.obj: gtk-logout-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-gtk-logout-helper.obj -MD -MP -MF $(DEPDIR)/gtk_logout_helper-gtk-logout-helper.Tpo -c -o gtk_logout_helper-gtk-logout-helper.obj `if test -f 'gtk-logout-helper.c'; then $(CYGPATH_W) 'gtk-logout-helper.c'; else $(CYGPATH_W) '$(srcdir)/gtk-logout-helper.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-gtk-logout-helper.Tpo $(DEPDIR)/gtk_logout_helper-gtk-logout-helper.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk-logout-helper.c' object='gtk_logout_helper-gtk-logout-helper.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtk-logout-helper.c' object='gtk_logout_helper-gtk-logout-helper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-gtk-logout-helper.obj `if test -f 'gtk-logout-helper.c'; then $(CYGPATH_W) 'gtk-logout-helper.c'; else $(CYGPATH_W) '$(srcdir)/gtk-logout-helper.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-gtk-logout-helper.obj `if test -f 'gtk-logout-helper.c'; then $(CYGPATH_W) 'gtk-logout-helper.c'; else $(CYGPATH_W) '$(srcdir)/gtk-logout-helper.c'; fi`
 
 gtk_logout_helper-settings-helper.o: settings-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-settings-helper.o -MD -MP -MF $(DEPDIR)/gtk_logout_helper-settings-helper.Tpo -c -o gtk_logout_helper-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-settings-helper.Tpo $(DEPDIR)/gtk_logout_helper-settings-helper.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings-helper.c' object='gtk_logout_helper-settings-helper.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='settings-helper.c' object='gtk_logout_helper-settings-helper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
 
 gtk_logout_helper-settings-helper.obj: settings-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-settings-helper.obj -MD -MP -MF $(DEPDIR)/gtk_logout_helper-settings-helper.Tpo -c -o gtk_logout_helper-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-settings-helper.Tpo $(DEPDIR)/gtk_logout_helper-settings-helper.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings-helper.c' object='gtk_logout_helper-settings-helper.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='settings-helper.c' object='gtk_logout_helper-settings-helper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
 
 gtk_logout_helper-dialog.o: dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-dialog.o -MD -MP -MF $(DEPDIR)/gtk_logout_helper-dialog.Tpo -c -o gtk_logout_helper-dialog.o `test -f 'dialog.c' || echo '$(srcdir)/'`dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-dialog.Tpo $(DEPDIR)/gtk_logout_helper-dialog.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dialog.c' object='gtk_logout_helper-dialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dialog.c' object='gtk_logout_helper-dialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-dialog.o `test -f 'dialog.c' || echo '$(srcdir)/'`dialog.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-dialog.o `test -f 'dialog.c' || echo '$(srcdir)/'`dialog.c
 
 gtk_logout_helper-dialog.obj: dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-dialog.obj -MD -MP -MF $(DEPDIR)/gtk_logout_helper-dialog.Tpo -c -o gtk_logout_helper-dialog.obj `if test -f 'dialog.c'; then $(CYGPATH_W) 'dialog.c'; else $(CYGPATH_W) '$(srcdir)/dialog.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-dialog.Tpo $(DEPDIR)/gtk_logout_helper-dialog.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dialog.c' object='gtk_logout_helper-dialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dialog.c' object='gtk_logout_helper-dialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-dialog.obj `if test -f 'dialog.c'; then $(CYGPATH_W) 'dialog.c'; else $(CYGPATH_W) '$(srcdir)/dialog.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-dialog.obj `if test -f 'dialog.c'; then $(CYGPATH_W) 'dialog.c'; else $(CYGPATH_W) '$(srcdir)/dialog.c'; fi`
 
 indicator_session_service-lock-helper.o: lock-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-lock-helper.o -MD -MP -MF $(DEPDIR)/indicator_session_service-lock-helper.Tpo -c -o indicator_session_service-lock-helper.o `test -f 'lock-helper.c' || echo '$(srcdir)/'`lock-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-lock-helper.Tpo $(DEPDIR)/indicator_session_service-lock-helper.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lock-helper.c' object='indicator_session_service-lock-helper.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lock-helper.c' object='indicator_session_service-lock-helper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-lock-helper.o `test -f 'lock-helper.c' || echo '$(srcdir)/'`lock-helper.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-lock-helper.o `test -f 'lock-helper.c' || echo '$(srcdir)/'`lock-helper.c
 
 indicator_session_service-lock-helper.obj: lock-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-lock-helper.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-lock-helper.Tpo -c -o indicator_session_service-lock-helper.obj `if test -f 'lock-helper.c'; then $(CYGPATH_W) 'lock-helper.c'; else $(CYGPATH_W) '$(srcdir)/lock-helper.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-lock-helper.Tpo $(DEPDIR)/indicator_session_service-lock-helper.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lock-helper.c' object='indicator_session_service-lock-helper.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lock-helper.c' object='indicator_session_service-lock-helper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-lock-helper.obj `if test -f 'lock-helper.c'; then $(CYGPATH_W) 'lock-helper.c'; else $(CYGPATH_W) '$(srcdir)/lock-helper.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-lock-helper.obj `if test -f 'lock-helper.c'; then $(CYGPATH_W) 'lock-helper.c'; else $(CYGPATH_W) '$(srcdir)/lock-helper.c'; fi`
 
 indicator_session_service-session-service.o: session-service.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-session-service.o -MD -MP -MF $(DEPDIR)/indicator_session_service-session-service.Tpo -c -o indicator_session_service-session-service.o `test -f 'session-service.c' || echo '$(srcdir)/'`session-service.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-session-service.Tpo $(DEPDIR)/indicator_session_service-session-service.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='session-service.c' object='indicator_session_service-session-service.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='session-service.c' object='indicator_session_service-session-service.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-session-service.o `test -f 'session-service.c' || echo '$(srcdir)/'`session-service.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-session-service.o `test -f 'session-service.c' || echo '$(srcdir)/'`session-service.c
 
 indicator_session_service-session-service.obj: session-service.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-session-service.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-session-service.Tpo -c -o indicator_session_service-session-service.obj `if test -f 'session-service.c'; then $(CYGPATH_W) 'session-service.c'; else $(CYGPATH_W) '$(srcdir)/session-service.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-session-service.Tpo $(DEPDIR)/indicator_session_service-session-service.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='session-service.c' object='indicator_session_service-session-service.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='session-service.c' object='indicator_session_service-session-service.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-session-service.obj `if test -f 'session-service.c'; then $(CYGPATH_W) 'session-service.c'; else $(CYGPATH_W) '$(srcdir)/session-service.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-session-service.obj `if test -f 'session-service.c'; then $(CYGPATH_W) 'session-service.c'; else $(CYGPATH_W) '$(srcdir)/session-service.c'; fi`
 
 indicator_session_service-session-dbus.o: session-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-session-dbus.o -MD -MP -MF $(DEPDIR)/indicator_session_service-session-dbus.Tpo -c -o indicator_session_service-session-dbus.o `test -f 'session-dbus.c' || echo '$(srcdir)/'`session-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-session-dbus.Tpo $(DEPDIR)/indicator_session_service-session-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='session-dbus.c' object='indicator_session_service-session-dbus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='session-dbus.c' object='indicator_session_service-session-dbus.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-session-dbus.o `test -f 'session-dbus.c' || echo '$(srcdir)/'`session-dbus.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-session-dbus.o `test -f 'session-dbus.c' || echo '$(srcdir)/'`session-dbus.c
 
 indicator_session_service-session-dbus.obj: session-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-session-dbus.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-session-dbus.Tpo -c -o indicator_session_service-session-dbus.obj `if test -f 'session-dbus.c'; then $(CYGPATH_W) 'session-dbus.c'; else $(CYGPATH_W) '$(srcdir)/session-dbus.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-session-dbus.Tpo $(DEPDIR)/indicator_session_service-session-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='session-dbus.c' object='indicator_session_service-session-dbus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='session-dbus.c' object='indicator_session_service-session-dbus.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-session-dbus.obj `if test -f 'session-dbus.c'; then $(CYGPATH_W) 'session-dbus.c'; else $(CYGPATH_W) '$(srcdir)/session-dbus.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-session-dbus.obj `if test -f 'session-dbus.c'; then $(CYGPATH_W) 'session-dbus.c'; else $(CYGPATH_W) '$(srcdir)/session-dbus.c'; fi`
 
 indicator_session_service-gen-session-dbus.xml.o: gen-session-dbus.xml.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-gen-session-dbus.xml.o -MD -MP -MF $(DEPDIR)/indicator_session_service-gen-session-dbus.xml.Tpo -c -o indicator_session_service-gen-session-dbus.xml.o `test -f 'gen-session-dbus.xml.c' || echo '$(srcdir)/'`gen-session-dbus.xml.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-gen-session-dbus.xml.Tpo $(DEPDIR)/indicator_session_service-gen-session-dbus.xml.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gen-session-dbus.xml.c' object='indicator_session_service-gen-session-dbus.xml.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gen-session-dbus.xml.c' object='indicator_session_service-gen-session-dbus.xml.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-gen-session-dbus.xml.o `test -f 'gen-session-dbus.xml.c' || echo '$(srcdir)/'`gen-session-dbus.xml.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-gen-session-dbus.xml.o `test -f 'gen-session-dbus.xml.c' || echo '$(srcdir)/'`gen-session-dbus.xml.c
 
 indicator_session_service-gen-session-dbus.xml.obj: gen-session-dbus.xml.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-gen-session-dbus.xml.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-gen-session-dbus.xml.Tpo -c -o indicator_session_service-gen-session-dbus.xml.obj `if test -f 'gen-session-dbus.xml.c'; then $(CYGPATH_W) 'gen-session-dbus.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-session-dbus.xml.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-gen-session-dbus.xml.Tpo $(DEPDIR)/indicator_session_service-gen-session-dbus.xml.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gen-session-dbus.xml.c' object='indicator_session_service-gen-session-dbus.xml.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gen-session-dbus.xml.c' object='indicator_session_service-gen-session-dbus.xml.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-gen-session-dbus.xml.obj `if test -f 'gen-session-dbus.xml.c'; then $(CYGPATH_W) 'gen-session-dbus.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-session-dbus.xml.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-gen-session-dbus.xml.obj `if test -f 'gen-session-dbus.xml.c'; then $(CYGPATH_W) 'gen-session-dbus.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-session-dbus.xml.c'; fi`
 
 indicator_session_service-settings-helper.o: settings-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-settings-helper.o -MD -MP -MF $(DEPDIR)/indicator_session_service-settings-helper.Tpo -c -o indicator_session_service-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-settings-helper.Tpo $(DEPDIR)/indicator_session_service-settings-helper.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings-helper.c' object='indicator_session_service-settings-helper.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='settings-helper.c' object='indicator_session_service-settings-helper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
 
 indicator_session_service-settings-helper.obj: settings-helper.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-settings-helper.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-settings-helper.Tpo -c -o indicator_session_service-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-settings-helper.Tpo $(DEPDIR)/indicator_session_service-settings-helper.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings-helper.c' object='indicator_session_service-settings-helper.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='settings-helper.c' object='indicator_session_service-settings-helper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
 
 indicator_session_service-users-service-dbus.o: users-service-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-users-service-dbus.o -MD -MP -MF $(DEPDIR)/indicator_session_service-users-service-dbus.Tpo -c -o indicator_session_service-users-service-dbus.o `test -f 'users-service-dbus.c' || echo '$(srcdir)/'`users-service-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-users-service-dbus.Tpo $(DEPDIR)/indicator_session_service-users-service-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='users-service-dbus.c' object='indicator_session_service-users-service-dbus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='users-service-dbus.c' object='indicator_session_service-users-service-dbus.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-users-service-dbus.o `test -f 'users-service-dbus.c' || echo '$(srcdir)/'`users-service-dbus.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-users-service-dbus.o `test -f 'users-service-dbus.c' || echo '$(srcdir)/'`users-service-dbus.c
 
 indicator_session_service-users-service-dbus.obj: users-service-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-users-service-dbus.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-users-service-dbus.Tpo -c -o indicator_session_service-users-service-dbus.obj `if test -f 'users-service-dbus.c'; then $(CYGPATH_W) 'users-service-dbus.c'; else $(CYGPATH_W) '$(srcdir)/users-service-dbus.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-users-service-dbus.Tpo $(DEPDIR)/indicator_session_service-users-service-dbus.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='users-service-dbus.c' object='indicator_session_service-users-service-dbus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='users-service-dbus.c' object='indicator_session_service-users-service-dbus.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-users-service-dbus.obj `if test -f 'users-service-dbus.c'; then $(CYGPATH_W) 'users-service-dbus.c'; else $(CYGPATH_W) '$(srcdir)/users-service-dbus.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-users-service-dbus.obj `if test -f 'users-service-dbus.c'; then $(CYGPATH_W) 'users-service-dbus.c'; else $(CYGPATH_W) '$(srcdir)/users-service-dbus.c'; fi`
 
 indicator_session_service-user-menu-mgr.o: user-menu-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-user-menu-mgr.o -MD -MP -MF $(DEPDIR)/indicator_session_service-user-menu-mgr.Tpo -c -o indicator_session_service-user-menu-mgr.o `test -f 'user-menu-mgr.c' || echo '$(srcdir)/'`user-menu-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-user-menu-mgr.Tpo $(DEPDIR)/indicator_session_service-user-menu-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='user-menu-mgr.c' object='indicator_session_service-user-menu-mgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='user-menu-mgr.c' object='indicator_session_service-user-menu-mgr.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-user-menu-mgr.o `test -f 'user-menu-mgr.c' || echo '$(srcdir)/'`user-menu-mgr.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-user-menu-mgr.o `test -f 'user-menu-mgr.c' || echo '$(srcdir)/'`user-menu-mgr.c
 
 indicator_session_service-user-menu-mgr.obj: user-menu-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-user-menu-mgr.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-user-menu-mgr.Tpo -c -o indicator_session_service-user-menu-mgr.obj `if test -f 'user-menu-mgr.c'; then $(CYGPATH_W) 'user-menu-mgr.c'; else $(CYGPATH_W) '$(srcdir)/user-menu-mgr.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-user-menu-mgr.Tpo $(DEPDIR)/indicator_session_service-user-menu-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='user-menu-mgr.c' object='indicator_session_service-user-menu-mgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='user-menu-mgr.c' object='indicator_session_service-user-menu-mgr.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-user-menu-mgr.obj `if test -f 'user-menu-mgr.c'; then $(CYGPATH_W) 'user-menu-mgr.c'; else $(CYGPATH_W) '$(srcdir)/user-menu-mgr.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-user-menu-mgr.obj `if test -f 'user-menu-mgr.c'; then $(CYGPATH_W) 'user-menu-mgr.c'; else $(CYGPATH_W) '$(srcdir)/user-menu-mgr.c'; fi`
 
 indicator_session_service-device-menu-mgr.o: device-menu-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-device-menu-mgr.o -MD -MP -MF $(DEPDIR)/indicator_session_service-device-menu-mgr.Tpo -c -o indicator_session_service-device-menu-mgr.o `test -f 'device-menu-mgr.c' || echo '$(srcdir)/'`device-menu-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-device-menu-mgr.Tpo $(DEPDIR)/indicator_session_service-device-menu-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='device-menu-mgr.c' object='indicator_session_service-device-menu-mgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='device-menu-mgr.c' object='indicator_session_service-device-menu-mgr.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-device-menu-mgr.o `test -f 'device-menu-mgr.c' || echo '$(srcdir)/'`device-menu-mgr.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-device-menu-mgr.o `test -f 'device-menu-mgr.c' || echo '$(srcdir)/'`device-menu-mgr.c
 
 indicator_session_service-device-menu-mgr.obj: device-menu-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-device-menu-mgr.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-device-menu-mgr.Tpo -c -o indicator_session_service-device-menu-mgr.obj `if test -f 'device-menu-mgr.c'; then $(CYGPATH_W) 'device-menu-mgr.c'; else $(CYGPATH_W) '$(srcdir)/device-menu-mgr.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-device-menu-mgr.Tpo $(DEPDIR)/indicator_session_service-device-menu-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='device-menu-mgr.c' object='indicator_session_service-device-menu-mgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='device-menu-mgr.c' object='indicator_session_service-device-menu-mgr.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-device-menu-mgr.obj `if test -f 'device-menu-mgr.c'; then $(CYGPATH_W) 'device-menu-mgr.c'; else $(CYGPATH_W) '$(srcdir)/device-menu-mgr.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-device-menu-mgr.obj `if test -f 'device-menu-mgr.c'; then $(CYGPATH_W) 'device-menu-mgr.c'; else $(CYGPATH_W) '$(srcdir)/device-menu-mgr.c'; fi`
 
 indicator_session_service-udev-mgr.o: udev-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.o -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udev-mgr.c' object='indicator_session_service-udev-mgr.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
 
 indicator_session_service-udev-mgr.obj: udev-mgr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='udev-mgr.c' object='indicator_session_service-udev-mgr.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
 
 indicator_session_service-apt-watcher.o: apt-watcher.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-apt-watcher.o -MD -MP -MF $(DEPDIR)/indicator_session_service-apt-watcher.Tpo -c -o indicator_session_service-apt-watcher.o `test -f 'apt-watcher.c' || echo '$(srcdir)/'`apt-watcher.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-apt-watcher.Tpo $(DEPDIR)/indicator_session_service-apt-watcher.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='apt-watcher.c' object='indicator_session_service-apt-watcher.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='apt-watcher.c' object='indicator_session_service-apt-watcher.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-apt-watcher.o `test -f 'apt-watcher.c' || echo '$(srcdir)/'`apt-watcher.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-apt-watcher.o `test -f 'apt-watcher.c' || echo '$(srcdir)/'`apt-watcher.c
 
 indicator_session_service-apt-watcher.obj: apt-watcher.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-apt-watcher.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-apt-watcher.Tpo -c -o indicator_session_service-apt-watcher.obj `if test -f 'apt-watcher.c'; then $(CYGPATH_W) 'apt-watcher.c'; else $(CYGPATH_W) '$(srcdir)/apt-watcher.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-apt-watcher.Tpo $(DEPDIR)/indicator_session_service-apt-watcher.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='apt-watcher.c' object='indicator_session_service-apt-watcher.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='apt-watcher.c' object='indicator_session_service-apt-watcher.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-apt-watcher.obj `if test -f 'apt-watcher.c'; then $(CYGPATH_W) 'apt-watcher.c'; else $(CYGPATH_W) '$(srcdir)/apt-watcher.c'; fi`
-
-indicator_session_service-apt-transaction.o: apt-transaction.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-apt-transaction.o -MD -MP -MF $(DEPDIR)/indicator_session_service-apt-transaction.Tpo -c -o indicator_session_service-apt-transaction.o `test -f 'apt-transaction.c' || echo '$(srcdir)/'`apt-transaction.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-apt-transaction.Tpo $(DEPDIR)/indicator_session_service-apt-transaction.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='apt-transaction.c' object='indicator_session_service-apt-transaction.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-apt-transaction.o `test -f 'apt-transaction.c' || echo '$(srcdir)/'`apt-transaction.c
-
-indicator_session_service-apt-transaction.obj: apt-transaction.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-apt-transaction.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-apt-transaction.Tpo -c -o indicator_session_service-apt-transaction.obj `if test -f 'apt-transaction.c'; then $(CYGPATH_W) 'apt-transaction.c'; else $(CYGPATH_W) '$(srcdir)/apt-transaction.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-apt-transaction.Tpo $(DEPDIR)/indicator_session_service-apt-transaction.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='apt-transaction.c' object='indicator_session_service-apt-transaction.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-apt-transaction.obj `if test -f 'apt-transaction.c'; then $(CYGPATH_W) 'apt-transaction.c'; else $(CYGPATH_W) '$(srcdir)/apt-transaction.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-apt-watcher.obj `if test -f 'apt-watcher.c'; then $(CYGPATH_W) 'apt-watcher.c'; else $(CYGPATH_W) '$(srcdir)/apt-watcher.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -928,10 +891,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/src/apt-transaction.c b/src/apt-transaction.c
deleted file mode 100644
index 2b3f5a4..0000000
--- a/src/apt-transaction.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Conor Curran <conor.curran@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <gio/gio.h>
-
-#include "apt-transaction.h"
-#include "dbus-shared-names.h"
-
-static void apt_transaction_investigate (AptTransaction* self);
-static void apt_transaction_simulate_transaction_cb (GObject * obj,
-                                                     GAsyncResult * res,
-                                                     gpointer user_data);
-static void apt_transaction_receive_signal (GDBusProxy * proxy,
-                                            gchar * sender_name,
-                                            gchar * signal_name,
-                                            GVariant * parameters,
-                                            gpointer user_data);
-static void apt_transaction_finish_proxy_setup (GObject *source_object,
-                                                GAsyncResult *res,
-                                                gpointer user_data);
-
-struct _AptTransaction
-{
-	GObject       parent_instance;
-	GDBusProxy *  proxy;    
-	GCancellable * proxy_cancel;  
-  gchar*        id;
-  TransactionType type;
-};
-
-enum {
-  UPDATE,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (AptTransaction, apt_transaction, G_TYPE_OBJECT);
-
-static void
-apt_transaction_init (AptTransaction *self)
-{
-  self->proxy = NULL;
-  self->id = NULL;
-  self->proxy_cancel = g_cancellable_new();
-}
-
-static void
-apt_transaction_finalize (GObject *object)
-{
-  AptTransaction* self = APT_TRANSACTION(object);
-  g_signal_handlers_disconnect_by_func (G_OBJECT (self->proxy),
-                                        G_CALLBACK (apt_transaction_receive_signal),
-                                        self);
-  if (self->proxy != NULL){
-    g_object_unref (self->proxy);
-    self->proxy = NULL;
-  }
-  g_free (self->id);
-	G_OBJECT_CLASS (apt_transaction_parent_class)->finalize (object);
-}
-
-static void
-apt_transaction_class_init (AptTransactionClass *klass)
-{
-	GObjectClass* object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = apt_transaction_finalize;
-
-  signals[UPDATE] =  g_signal_new("state-update",
-                                   G_TYPE_FROM_CLASS (klass),
-                                   G_SIGNAL_RUN_LAST,
-                                   0,
-                                   NULL, NULL,
-                                   g_cclosure_marshal_VOID__INT,
-                                   G_TYPE_NONE, 1, G_TYPE_INT);  
-}
-
-// TODO: you don't need this additional helper
-// Just GObject properties properly
-static void
-apt_transaction_investigate (AptTransaction* self)
-{
-  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-                            G_DBUS_PROXY_FLAGS_NONE,
-                            NULL,
-                            "org.debian.apt",
-                            self->id,
-                            "org.debian.apt.transaction",
-                            self->proxy_cancel,
-                            apt_transaction_finish_proxy_setup,
-                            self);
-}
-
-static void
-apt_transaction_finish_proxy_setup (GObject *source_object,
-                                    GAsyncResult *res,
-                                    gpointer user_data)
-{
-  g_return_if_fail (APT_IS_TRANSACTION (user_data));
-  AptTransaction* self = APT_TRANSACTION(user_data);      
-	GError * error = NULL;
-
-	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
-
-	if (self->proxy_cancel != NULL) {
-		g_object_unref(self->proxy_cancel);
-		self->proxy_cancel = NULL;
-	}
-
-	if (error != NULL) {
-		g_warning("Could not grab DBus proxy for %s: %s",
-               "org.debian.apt", error->message);
-		g_error_free(error);
-		return;
-	}
-  
-  self->proxy = proxy;
-
-  g_signal_connect (G_OBJECT(self->proxy),
-                    "g-signal",
-                    G_CALLBACK (apt_transaction_receive_signal),
-                    self);    
-
-  if (self->type == SIMULATION){
-    g_dbus_proxy_call (self->proxy,
-                       "Simulate",
-                       NULL,
-                       G_DBUS_CALL_FLAGS_NONE,
-                       -1,
-                       NULL,
-                       apt_transaction_simulate_transaction_cb,
-                       self);                                                                                        
-  }                       
-}
-
-static void
-apt_transaction_receive_signal (GDBusProxy * proxy,
-                                gchar * sender_name,
-                                gchar * signal_name,
-                                GVariant * parameters,
-                                gpointer user_data)
-{
-  g_return_if_fail (APT_IS_TRANSACTION (user_data));
-  AptTransaction* self = APT_TRANSACTION(user_data);
-  AptState current_state = DONT_KNOW;
-  
-  if (g_strcmp0(signal_name, "PropertyChanged") == 0) 
-  {
-    gchar* prop_name= NULL;
-    GVariant* value = NULL;
-    g_variant_get (parameters, "(sv)", &prop_name, &value);    
-    g_debug ("transaction prop update - prop = %s", prop_name);
-    
-    if (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING) == TRUE){
-      gchar* key = NULL;
-      g_variant_get (value, "s", &key);
-      g_debug ("transaction prop update - value = %s", key);
-    }
-    
-    if (g_strcmp0 (prop_name, "Dependencies") == 0){
-            
-      gchar** install = NULL;
-      gchar** reinstall = NULL;
-      gchar** remove = NULL;
-      gchar** purge = NULL;
-      gchar** upgrade = NULL;
-      gchar** downgrade = NULL;
-      gchar** keep = NULL;
-      g_variant_get (value, "(asasasasasasas)", &install, 
-                     &reinstall, &remove, &purge, &upgrade, &downgrade,
-                     &keep);      
-      /*                     
-      g_debug ("upgrade package length %i", g_strv_length(upgrade));                
-      g_debug ("install package length %i", g_strv_length(install));
-      g_debug ("reinstall package length %i", g_strv_length(reinstall));
-      g_debug ("remove package length %i", g_strv_length(remove));
-      g_debug ("purge package length %i", g_strv_length(purge));
-      */
-      gboolean upgrade_needed = (g_strv_length(upgrade) > 1) ||
-                                (g_strv_length(install) > 1) ||
-                                (g_strv_length(reinstall) > 1) ||
-                                (g_strv_length(remove) > 1) ||
-                                (g_strv_length(purge) > 1);
-      if (upgrade_needed == TRUE){
-        current_state = UPDATES_AVAILABLE;        
-      }
-      else{
-        current_state = UP_TO_DATE;
-      }
-    }
-    if (self->type == REAL)
-    {
-      GVariant* role = g_dbus_proxy_get_cached_property (self->proxy,
-                                                         "Role");
-      if (g_variant_is_of_type (role, G_VARIANT_TYPE_STRING) == TRUE){
-        gchar* current_role = NULL;
-        g_variant_get (role, "s", &current_role);
-        //g_debug ("Current transaction role = %s", current_role);
-        if (g_strcmp0 (current_role, "role-commit-packages") == 0 ||
-            g_strcmp0 (current_role, "role-upgrade-system") == 0){
-          g_debug ("UPGRADE IN PROGRESS");
-          current_state = UPGRADE_IN_PROGRESS;                        
-        }
-      }
-    } 
-  }
-  else if (g_strcmp0(signal_name, "Finished") == 0) 
-  {
-    g_debug ("TRANSACTION Finished");
-    current_state = FINISHED;
-  }
-  // Finally send out the state update  
-  if (current_state != DONT_KNOW){
-    g_signal_emit (self,
-                   signals[UPDATE],
-                   0,
-                   current_state);
-  }
-}
-
-static void
-apt_transaction_simulate_transaction_cb (GObject * obj,
-                                         GAsyncResult * res,
-                                         gpointer user_data)
-{
-	GError * error = NULL;
-	if (error != NULL) {
-    g_warning ("unable to complete the simulate call");
-    g_error_free (error);
-		return;
-	}
-}
-TransactionType 
-apt_transaction_get_transaction_type (AptTransaction* self)
-{
-  return self->type;
-}
-
-AptTransaction* apt_transaction_new (gchar* transaction_id, TransactionType t)
-{
-  AptTransaction* tr = g_object_new (APT_TYPE_TRANSACTION, NULL);
-  tr->id = transaction_id;
-  tr->type = t;
-  g_debug ("Apt transaction new id = %s", tr->id);
-  apt_transaction_investigate (tr);
-  return tr;
-}
diff --git a/src/apt-transaction.h b/src/apt-transaction.h
deleted file mode 100644
index 9e4370d..0000000
--- a/src/apt-transaction.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Conor Curran <conor.curran@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _APT_TRANSACTION_H_
-#define _APT_TRANSACTION_H_
-
-#include <glib-object.h>
-#include "dbus-shared-names.h"
-
-G_BEGIN_DECLS
-
-#define APT_TYPE_TRANSACTION             (apt_transaction_get_type ())
-#define APT_TRANSACTION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), APT_TYPE_TRANSACTION, AptTransaction))
-#define APT_TRANSACTION_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), APT_TYPE_TRANSACTION, AptTransactionClass))
-#define APT_IS_TRANSACTION(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APT_TYPE_TRANSACTION))
-#define APT_IS_TRANSACTION_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), APT_TYPE_TRANSACTION))
-#define APT_TRANSACTION_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), APT_TYPE_TRANSACTION, AptTransactionClass))
-
-typedef struct _AptTransactionClass AptTransactionClass;
-typedef struct _AptTransaction AptTransaction;
-
-struct _AptTransactionClass
-{
-	GObjectClass parent_class;
-};
-
-AptTransaction* apt_transaction_new (gchar* transaction_id, TransactionType t);
-TransactionType apt_transaction_get_transaction_type (AptTransaction* self);
-GType apt_transaction_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* _APT_TRANSACTION_H_ */
diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 481029a..6e8a5c9 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -17,150 +17,113 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <gio/gio.h>
+// Conor - 6/2/2012
+// Please pull in packagekit's client lib
+// using apt-get install --no-install-recommends libpackagekit-glib2-dev
+// make sure you don't install package-kit
+#define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
+
 #include <glib/gi18n.h>
+#include <packagekit-glib2/packagekit.h>
 #include "apt-watcher.h"
-#include "apt-transaction.h"
+#include "dbus-shared-names.h"
 
 static guint watcher_id;
 
 struct _AptWatcher
 {
 	GObject parent_instance;
-  guint reboot_query;
-	GCancellable * proxy_cancel;
-	GDBusProxy * proxy;  
   SessionDbus* session_dbus_interface;
   DbusmenuMenuitem* apt_item;
   AptState current_state;
-  AptTransaction* current_transaction;
+  GCancellable * proxy_cancel;
+  GDBusProxy * proxy;
 };
-
-static void
-apt_watcher_on_name_appeared (GDBusConnection *connection,
-                              const gchar     *name,
-                              const gchar     *name_owner,
-                              gpointer         user_data);
-static void
-apt_watcher_on_name_vanished (GDBusConnection *connection,
-                              const gchar     *name,
-                              gpointer         user_data);
-static void fetch_proxy_cb (GObject * object,
-                            GAsyncResult * res,
-                            gpointer user_data);
-
-static void apt_watcher_upgrade_system_cb (GObject * obj,
-                                           GAsyncResult * res,
-                                           gpointer user_data);
-                                                 
-                
-static void apt_watcher_show_apt_dialog (DbusmenuMenuitem* mi,
-                                         guint timestamp,
-                                         gpointer userdata);
-
-static void apt_watcher_signal_cb (GDBusProxy* proxy,
-                                   gchar* sender_name,
-                                   gchar* signal_name,
-                                   GVariant* parameters,
-                                   gpointer user_data);
-static void  apt_watcher_manage_transactions (AptWatcher* self,
-                                              gchar* transaction_id);
-static gboolean apt_watcher_query_reboot_status (gpointer self);
-static void apt_watcher_transaction_state_simulation_update_cb (AptTransaction* trans,
-                                                                gint update,
-                                                                gpointer user_data);
-static void apt_watcher_transaction_state_real_update_cb (AptTransaction* trans,
-                                                          gint update,
-                                                          gpointer user_data);                                   
-static gboolean apt_watcher_start_apt_interaction (gpointer data);
-
+                                                                
 G_DEFINE_TYPE (AptWatcher, apt_watcher, G_TYPE_OBJECT);
 
+
 static void
-apt_watcher_init (AptWatcher *self)
+get_updates_complete (GObject *source_object,
+                      GAsyncResult *res,
+                      gpointer user_data)
 {
-  self->current_state = UP_TO_DATE;
-  self->proxy_cancel = g_cancellable_new();
-  self->proxy = NULL;
-  self->reboot_query = 0;
-  self->current_transaction = NULL;  
-  g_timeout_add_seconds (60,
-                         apt_watcher_start_apt_interaction,
-                         self);   
-}
+  g_return_if_fail (APT_IS_WATCHER (user_data));
+  AptWatcher* self = APT_WATCHER (user_data);
 
-static gboolean 
-apt_watcher_start_apt_interaction (gpointer data)
-{
-  g_return_val_if_fail (APT_IS_WATCHER (data), FALSE);
-  AptWatcher* self = APT_WATCHER (data);
-  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-                            G_DBUS_PROXY_FLAGS_NONE,
-                            NULL,
-                            "org.debian.apt",
-                            "/org/debian/apt",
-                            "org.debian.apt",
-                            self->proxy_cancel,
-                            fetch_proxy_cb,
-                            self);
-  return FALSE;    
-}
+  PkResults *results;
+  GError *error = NULL;
+  results = pk_client_generic_finish (PK_CLIENT(source_object), res, &error);
+  
+  if (error != NULL){
+    g_warning ("Unable to query for updates - error - %s", error->message);
+    return;
+  }
 
-static void
-apt_watcher_finalize (GObject *object)
-{
-  g_bus_unwatch_name (watcher_id);  
-  AptWatcher* self = APT_WATCHER (object);
-           
-  if (self->proxy != NULL)
-    g_object_unref (self->proxy);
+  GPtrArray *packages;
+  packages = pk_results_get_package_array (results);
 
-	G_OBJECT_CLASS (apt_watcher_parent_class)->finalize (object);
+  const gchar* disposition;
+  disposition = dbusmenu_menuitem_property_get (self->apt_item,
+                                                DBUSMENU_MENUITEM_PROP_DISPOSITION);
+  gboolean do_update;
+  do_update = g_strcmp0 (disposition, DBUSMENU_MENUITEM_DISPOSITION_ALERT) != 0;                                       
+
+  if (packages->len > 0){
+    g_print ("Apparently we have updates available - change dbmitem %i", do_update);   
+      if (do_update) 
+        dbusmenu_menuitem_property_set (self->apt_item,
+                                        DBUSMENU_MENUITEM_PROP_LABEL,
+                                        _("Updates Available…"));    
+  }
+  else{
+    g_print ("No updates available - change dbmitem - %i", do_update);   
+      if (do_update)
+        dbusmenu_menuitem_property_set (self->apt_item,
+                                        DBUSMENU_MENUITEM_PROP_LABEL,
+                                        _("Software Up to Date"));       
+  }
+  g_ptr_array_unref (packages);
+  g_object_unref (results);
+  g_object_unref (source_object);
 }
 
 static void
-apt_watcher_class_init (AptWatcherClass *klass)
+apt_watcher_check_for_updates (AptWatcher* self)
 {
-	GObjectClass* object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = apt_watcher_finalize;
+    PkClient* client;
+    client = pk_client_new ();
+
+    pk_client_get_updates_async (client, 
+                                 PK_FILTER_ENUM_NONE,
+                                 NULL, NULL, NULL,
+                                 (GAsyncReadyCallback)get_updates_complete,
+                                 self);  
 }
 
-static void
-fetch_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
+static void apt_watcher_signal_cb ( GDBusProxy* proxy,
+                                    gchar* sender_name,
+                                    gchar* signal_name,
+                                    GVariant* parameters,
+                                    gpointer user_data)
 {
-	GError * error = NULL;
-
-	AptWatcher* self = APT_WATCHER(user_data);
-	g_return_if_fail(self != NULL);
-
-	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
-
-	if (self->proxy_cancel != NULL) {
-		g_object_unref(self->proxy_cancel);
-		self->proxy_cancel = NULL;
-	}
-
-	if (error != NULL) {
-		g_warning("Could not grab DBus proxy for %s: %s",
-               "org.debian.apt", error->message);
-		g_error_free(error);
-		return;
-	}
+  g_return_if_fail (APT_IS_WATCHER (user_data));
+  AptWatcher* self = APT_WATCHER (user_data);
 
-	self->proxy = proxy;
-  // Set up the watch.
-  watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM,
-                                 "org.debian.apt",
-                                 G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                 apt_watcher_on_name_appeared,
-                                 apt_watcher_on_name_vanished,
-                                 self,
-                                 NULL);
-  
-	g_signal_connect (self->proxy,
-                    "g-signal",
-                    G_CALLBACK(apt_watcher_signal_cb),
-                    self);   
+  g_debug ("apt-watcher-signal cb signal name - %s", signal_name);
+  if (g_strcmp0(signal_name, "UpdatesChanged") == 0){
+    g_debug ("updates changed signal received");
+    apt_watcher_check_for_updates (self);
+  }
+  else if (g_strcmp0(signal_name, "RestartScheduled") == 0) {
+    g_debug ("RestartScheduled signal received");
+    dbusmenu_menuitem_property_set (self->apt_item,
+                                    DBUSMENU_MENUITEM_PROP_LABEL,
+                                    _("Restart to Complete Updates…"));
+    dbusmenu_menuitem_property_set (self->apt_item,
+                                    DBUSMENU_MENUITEM_PROP_DISPOSITION,
+                                    DBUSMENU_MENUITEM_DISPOSITION_ALERT);     
+  } 
 }
 
 static void
@@ -170,21 +133,12 @@ apt_watcher_on_name_appeared (GDBusConnection *connection,
                               gpointer         user_data)
 {
   g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* watcher = APT_WATCHER (user_data);
+ // AptWatcher* watcher = APT_WATCHER (user_data);
   
   g_print ("Name %s on %s is owned by %s\n",
            name,
            "the system bus",
            name_owner);
-
-  g_dbus_proxy_call (watcher->proxy,
-                     "UpgradeSystem",
-                     g_variant_new("(b)", TRUE),
-                     G_DBUS_CALL_FLAGS_NONE,
-                     -1,
-                     NULL,
-                     apt_watcher_upgrade_system_cb,
-                     user_data);                  
 }
 
 
@@ -199,36 +153,61 @@ apt_watcher_on_name_vanished (GDBusConnection *connection,
 }
 
 static void
-apt_watcher_upgrade_system_cb (GObject * obj,
-                               GAsyncResult * res,
-                               gpointer user_data)
+fetch_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
 {
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* self = APT_WATCHER (user_data);
+  GError * error = NULL;
 
-	GError * error = NULL;
-	GVariant * result;
+  AptWatcher* self = APT_WATCHER(user_data);
+  g_return_if_fail(self != NULL);
 
-	result = g_dbus_proxy_call_finish(self->proxy, res, &error);
+  GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
 
-	if (error != NULL) {
-    g_warning ("unable to complete the UpgradeSystem apt call");
-    g_error_free (error);
-		return;
-	}
-  
-  gchar* transaction_id = NULL;
-  g_variant_get (result, "(s)", &transaction_id);
+  if (self->proxy_cancel != NULL) {
+    g_object_unref (self->proxy_cancel);
+    self->proxy_cancel = NULL;
+  }
 
-  if (transaction_id == NULL){
-    g_warning ("apt_watcher_upgrade_system_cb - transaction id is null");
+  if (error != NULL) {
+    g_warning("Could not grab DBus proxy for %s: %s",
+               "org.debian.apt", error->message);
+    g_error_free(error);
     return;
-  }  
-  
-  apt_watcher_manage_transactions (self, transaction_id);
-  
+  }
+
+  self->proxy = proxy;
+  // Set up the watch.
+  watcher_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM,
+                                 "org.freedesktop.PackageKit",
+                                 G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                 apt_watcher_on_name_appeared,
+                                 apt_watcher_on_name_vanished,
+                                 self,
+                                 NULL);  
+  g_signal_connect (self->proxy,
+                    "g-signal",
+                    G_CALLBACK(apt_watcher_signal_cb),
+                    self);   
+}
+
+static gboolean 
+apt_watcher_start_apt_interaction (gpointer data)
+{
+  g_return_val_if_fail (APT_IS_WATCHER (data), FALSE);
+  AptWatcher* self = APT_WATCHER (data);
+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+                            G_DBUS_PROXY_FLAGS_NONE,
+                            NULL,
+                            "org.freedesktop.PackageKit",
+                            "/org/freedesktop/PackageKit",
+                            "org.freedesktop.PackageKit",
+                            self->proxy_cancel,
+                            fetch_proxy_cb,
+                            self);
+  apt_watcher_check_for_updates (self);
+  return FALSE;    
 }
 
+
 static void
 apt_watcher_show_apt_dialog (DbusmenuMenuitem * mi,
                              guint timestamp,
@@ -261,224 +240,31 @@ apt_watcher_show_apt_dialog (DbusmenuMenuitem * mi,
 }
 
 static void
-apt_watcher_transaction_state_real_update_cb (AptTransaction* trans,
-                                              gint update,
-                                              gpointer user_data)
-{
-  g_debug ("apt-watcher -transaction update %i", update);
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* self = APT_WATCHER (user_data);
-  
-  AptState state = (AptState)update;
-  if (self->current_state != RESTART_NEEDED)
-  {
-    if (state == UP_TO_DATE){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Software Up to Date"));   
-      self->current_state = state;                                                
-    }
-    else if (state == UPDATES_AVAILABLE){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Updates Available…"));    
-      self->current_state = state;                                    
-    }
-    else if (state == UPGRADE_IN_PROGRESS){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Updates Installing…"));    
-      self->current_state = state;                                    
-    }  
-    else if (state == FINISHED){
-      gboolean query_again = FALSE;
-      
-      // Only query if the previous state was an upgrade.
-      if (self->current_state != UPGRADE_IN_PROGRESS){
-        query_again = TRUE;      
-      }    
-      else{
-        if (self->reboot_query != 0){
-          g_source_remove (self->reboot_query);
-          self->reboot_query = 0;
-        }
-        self->reboot_query = g_timeout_add_seconds (1,
-                                                    apt_watcher_query_reboot_status,
-                                                    self);         
-      }
-      self->current_state = state;
-
-      g_object_unref (G_OBJECT(self->current_transaction));
-      self->current_transaction = NULL;
-
-      // It is impossible to determine from a 'real' transaction whether
-      // updates are available therefore it is necessary to check again via a 
-      // simulation whether there are updates available. 
-      if (query_again){
-        g_dbus_proxy_call (self->proxy,
-                           "UpgradeSystem",
-                           g_variant_new("(b)", TRUE),
-                           G_DBUS_CALL_FLAGS_NONE,
-                           -1,
-                           NULL,
-                           apt_watcher_upgrade_system_cb,
-                           self);
-      }      
-    }
-  }
-}                                              
-
-
-static void
-apt_watcher_transaction_state_simulation_update_cb (AptTransaction* trans,
-                                                    gint update,
-                                                    gpointer user_data)
-{
-  g_debug ("apt-watcher -transaction update %i", update);
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* self = APT_WATCHER (user_data);
-  
-  AptState state = (AptState)update;
-  if (self->current_state != RESTART_NEEDED)
-  {
-    if (state == UP_TO_DATE){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Software Up to Date"));   
-      if (self->reboot_query != 0){
-        g_source_remove (self->reboot_query);
-        self->reboot_query = 0;
-      }
-      self->reboot_query = g_timeout_add_seconds (1,
-                                                  apt_watcher_query_reboot_status,
-                                                  self); 
-    }
-    else if (state == UPDATES_AVAILABLE){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Updates Available…"));    
-    }
-    else if (state == UPGRADE_IN_PROGRESS){
-      dbusmenu_menuitem_property_set (self->apt_item,
-                                      DBUSMENU_MENUITEM_PROP_LABEL,
-                                      _("Updates Installing…"));    
-    }  
-    self->current_state = state;
-  }  
-  if (self->current_state != UPGRADE_IN_PROGRESS){
-    g_object_unref (G_OBJECT(self->current_transaction));
-    self->current_transaction = NULL;
-  }
-} 
- 
-static void
-apt_watcher_manage_transactions (AptWatcher* self, gchar* transaction_id)
+apt_watcher_init (AptWatcher *self)
 {
-    if (self->current_transaction == NULL){
-      self->current_transaction = apt_transaction_new (transaction_id, SIMULATION);
-      g_signal_connect (G_OBJECT(self->current_transaction),
-                        "state-update",
-                        G_CALLBACK(apt_watcher_transaction_state_simulation_update_cb), self);
-    }
+  self->current_state = UP_TO_DATE;
+  g_timeout_add_seconds (60,
+                         apt_watcher_start_apt_interaction,
+                         self); 
 }
 
-static gboolean
-apt_watcher_query_reboot_status (gpointer data)
+static void
+apt_watcher_finalize (GObject *object)
 {
-  g_return_val_if_fail (APT_IS_WATCHER (data), FALSE);
-  AptWatcher* self = APT_WATCHER (data);
-  
-  GVariant* reboot_result = g_dbus_proxy_get_cached_property (self->proxy,
-                                                             "RebootRequired");
-  gboolean reboot = FALSE;
-  g_variant_get (reboot_result, "b", &reboot);
-  g_debug ("apt_watcher_query_reboot_status: reboot prop = %i", reboot);
-  if (reboot == FALSE){
-    dbusmenu_menuitem_property_set (self->apt_item,
-                                    DBUSMENU_MENUITEM_PROP_LABEL,
-                                    _("Software Up to Date"));
-    dbusmenu_menuitem_property_set (self->apt_item,
-                                    DBUSMENU_MENUITEM_PROP_DISPOSITION,
-                                    DBUSMENU_MENUITEM_DISPOSITION_NORMAL);
-                                    
-  }
-  else{
-    dbusmenu_menuitem_property_set (self->apt_item,
-                                    DBUSMENU_MENUITEM_PROP_LABEL,
-                                    _("Restart to Complete Updates…"));
-    dbusmenu_menuitem_property_set (self->apt_item,
-                                    DBUSMENU_MENUITEM_PROP_DISPOSITION,
-                                    DBUSMENU_MENUITEM_DISPOSITION_ALERT);
-    session_dbus_restart_required (self->session_dbus_interface);
-    self->current_state = RESTART_NEEDED;
-  }
-  self->reboot_query = 0;
-  return FALSE;
+  g_bus_unwatch_name (watcher_id);  
+  AptWatcher* self = APT_WATCHER (object);
+           
+  if (self->proxy != NULL)
+    g_object_unref (self->proxy);
+         
+  G_OBJECT_CLASS (apt_watcher_parent_class)->finalize (object);
 }
 
-static void apt_watcher_signal_cb ( GDBusProxy* proxy,
-                                    gchar* sender_name,
-                                    gchar* signal_name,
-                                    GVariant* parameters,
-                                    gpointer user_data)
+static void
+apt_watcher_class_init (AptWatcherClass *klass)
 {
-  g_return_if_fail (APT_IS_WATCHER (user_data));
-  AptWatcher* self = APT_WATCHER (user_data);
-
-  g_variant_ref_sink (parameters);
-  GVariant *value = g_variant_get_child_value (parameters, 0);
-
-  if (g_strcmp0(signal_name, "ActiveTransactionsChanged") == 0){
-    gchar* current = NULL;
-    g_debug ("ActiveTransactionsChanged");
-
-    g_variant_get(value, "s", &current);
-
-    if (g_str_has_prefix (current, "/org/debian/apt/transaction/") == TRUE){
-      g_debug ("ActiveTransactionsChanged - current is %s", current);
-     
-      // Cancel all existing operations.
-      if (self->reboot_query != 0){
-        g_source_remove (self->reboot_query);
-        self->reboot_query = 0;
-      }
-
-      if (self->current_transaction != NULL)
-      {
-        g_object_unref (G_OBJECT(self->current_transaction));
-        self->current_transaction = NULL;
-      }
-
-      self->current_transaction = apt_transaction_new (current, REAL);
-      g_signal_connect (G_OBJECT(self->current_transaction),
-                        "state-update",
-                        G_CALLBACK(apt_watcher_transaction_state_real_update_cb), self);              
-    }
-  }
-  else if (g_strcmp0(signal_name, "PropertyChanged") == 0) 
-  {
-    gchar* prop_name= NULL;
-    GVariant* value = NULL;
-    g_variant_get (parameters, "(sv)", &prop_name, &value);    
-    g_debug ("transaction prop update - prop = %s", prop_name);    
-    
-    if (g_strcmp0 (prop_name, "RebootRequired") == 0){
-      gboolean reboot_required = FALSE;
-      g_variant_get (value, "(b)", &reboot_required); 
-      if (reboot_required){
-        dbusmenu_menuitem_property_set (self->apt_item,
-                                        DBUSMENU_MENUITEM_PROP_LABEL,
-                                        _("Restart to Complete Updates…"));
-        dbusmenu_menuitem_property_set (self->apt_item,
-                                        DBUSMENU_MENUITEM_PROP_DISPOSITION,
-                                        DBUSMENU_MENUITEM_DISPOSITION_ALERT); 
-        self->current_state = RESTART_NEEDED;                                            
-      }   
-    }    
-  } 
-
-  g_variant_unref (value);
-  g_variant_unref (parameters);
+  GObjectClass* object_class = G_OBJECT_CLASS (klass);
+  object_class->finalize = apt_watcher_finalize;
 }
 
 AptWatcher* apt_watcher_new (SessionDbus* session_dbus,
diff --git a/src/apt-watcher.h b/src/apt-watcher.h
index 6b7d5e1..c571502 100644
--- a/src/apt-watcher.h
+++ b/src/apt-watcher.h
@@ -50,7 +50,6 @@ GType apt_watcher_get_type (void) G_GNUC_CONST;
 
 AptWatcher* apt_watcher_new (SessionDbus* session_dbus,
                              DbusmenuMenuitem* apt_item);
-
 G_END_DECLS
 
 #endif /* _APT_WATCHER_H_ */
diff --git a/src/user-widget.c b/src/user-widget.c
index 88ac11c..33b9e40 100644
--- a/src/user-widget.c
+++ b/src/user-widget.c
@@ -136,11 +136,13 @@ user_widget_init (UserWidget *self)
   gtk_misc_set_padding (GTK_MISC(priv->user_image),0, 4.0);
   
   priv->user_name = gtk_label_new ("");
+
 #if HAVE_GTK3
   priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 #else
   priv->container = gtk_hbox_new (FALSE, 0);
 #endif
+
 	priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in",
                                                    GTK_ICON_SIZE_MENU);
  	gtk_misc_set_alignment(GTK_MISC(priv->tick_icon), 1.0, 0.5);
-- 
cgit v1.2.3