From 95b5c6328bbee9bda1473d8c8af3bbed8eba67f8 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Fri, 12 Aug 2011 13:23:35 +0100
Subject: fixed the misguided software available flag

---
 src/apt-transaction.c   | 17 ++++++++++++-----
 src/apt-watcher.c       |  7 +++----
 src/indicator-session.c |  6 ++----
 3 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/apt-transaction.c b/src/apt-transaction.c
index 647f4ba..be1c57b 100644
--- a/src/apt-transaction.c
+++ b/src/apt-transaction.c
@@ -185,11 +185,18 @@ apt_transaction_receive_signal (GDBusProxy * proxy,
       g_variant_get (value, "(asasasasasasas)", &install, 
                      &reinstall, &remove, &purge, &upgrade, &downgrade,
                      &keep);      
-      gboolean upgrade_needed = (g_strv_length(upgrade) > 0) ||
-                                (g_strv_length(install) > 0) ||
-                                (g_strv_length(reinstall) > 0) ||
-                                (g_strv_length(remove) > 0) ||
-                                (g_strv_length(purge) > 0);
+      /*                     
+      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;        
       }
diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 72a63ac..7d706a0 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -281,8 +281,9 @@ apt_watcher_transaction_state_update_cb (AptTransaction* trans,
                                       _("Reboot Required"));
       session_dbus_restart_required (self->session_dbus_interface);
     }
+    g_debug ("Finished with a reboot value of %i", reboot); 
     g_object_unref (G_OBJECT(self->current_transaction));
-    self->current_transaction = NULL;                                        
+    self->current_transaction = NULL;                                    
   }
   self->current_state = state;
 } 
@@ -327,9 +328,7 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
       self->current_transaction = apt_transaction_new (input, REAL);
       g_signal_connect (G_OBJECT(self->current_transaction),
                         "state-update",
-                        G_CALLBACK(apt_watcher_transaction_state_update_cb), self);
-      
-          
+                        G_CALLBACK(apt_watcher_transaction_state_update_cb), self);              
     }
   }
   g_variant_unref (parameters);
diff --git a/src/indicator-session.c b/src/indicator-session.c
index bfe0b75..f6727d9 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -163,13 +163,11 @@ indicator_session_init (IndicatorSession *self)
   }
                                                       
   self->users.label = GTK_LABEL (gtk_label_new (NULL));
-  // Only show once we have a valid username
-  // gtk_widget_hide (GTK_WIDGET(self->users.label));
 
   // devices
   self->devices.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME,
                                                       INDICATOR_SESSION_DBUS_OBJECT));
-  self->devices.image = indicator_image_helper (ICON_DEFAULT);
+  self->devices.image = indicator_image_helper ("system-devices-panel");
   
   gtk_widget_show (GTK_WIDGET(self->devices.menu));
   gtk_widget_show (GTK_WIDGET(self->devices.image));
@@ -501,7 +499,7 @@ receive_signal (GDBusProxy * proxy,
   }
   else if (g_strcmp0(signal_name, "RebootRequired") == 0) {
     // TODO waiting on design to give me a name.
-    self->devices.image = indicator_image_helper (ICON_DEFAULT);        
+    self->devices.image = indicator_image_helper ("system-devices-alert-panel");        
   }  
 }
 
-- 
cgit v1.2.3