Import upstream version 0.3.4.2

7 files changed, 33 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index dc4bd58..19fb469 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 # Generated by Makefile. Do not edit.
 
+2011-09-02  Conor Curran  <conor.curran@canonical.com>
+
+	remove the greeter icon stuff
+
+2011-09-02  Conor Curran  <conor.curran@canonical.com>
+
+	bumped version in prep for release
+
+2011-09-02  Conor Curran  <conor.curran@canonical.com>
+
+	apt menuitem should now finally be working properly
+
+2011-09-02  Conor Curran  <conor.curran@canonical.com>
+
+	final apt menuitem bugs fixes
+
 2011-09-01  Conor Curran  <conor.curran@canonical.com>
 
 	ready for 0.3.4.1
diff --git a/configure b/configure
index f18b460..860c97f 100755
--- a/configure
+++ b/configure
@@ -2745,7 +2745,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.3.4.1
+ VERSION=0.3.4.2
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 49353b2..951e8a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.3.4.1)
+AM_INIT_AUTOMAKE(indicator-session, 0.3.4.2)
 
 AM_MAINTAINER_MODE
 
diff --git a/src/apt-transaction.c b/src/apt-transaction.c
index be1c57b..cd9e131 100644
--- a/src/apt-transaction.c
+++ b/src/apt-transaction.c
@@ -213,7 +213,7 @@ apt_transaction_receive_signal (GDBusProxy * proxy,
     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);
+      //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");
diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index f5c9d55..480e174 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -298,6 +298,11 @@ apt_watcher_transaction_state_update_cb (AptTransaction* trans,
   else if (state == FINISHED){
     g_object_unref (G_OBJECT(self->current_transaction));
     self->current_transaction = NULL;   
+
+    if (self->current_state == UPDATES_AVAILABLE){
+      return;    
+    }
+    
     if (self->reboot_query != 0){
       g_source_remove (self->reboot_query);
       self->reboot_query = 0;
@@ -359,8 +364,6 @@ apt_watcher_query_reboot_status (gpointer data)
   return FALSE;
 }
 
-// TODO - Ask MVO about this.
-// Signal is of type s not sas which is on d-feet.
 static void apt_watcher_signal_cb ( GDBusProxy* proxy,
                                     gchar* sender_name,
                                     gchar* signal_name,
@@ -374,10 +377,13 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
   GVariant *value = g_variant_get_child_value (parameters, 0);
 
   if (g_strcmp0(signal_name, "ActiveTransactionsChanged") == 0){
-    gchar* input = NULL;
-    g_variant_get(value, "s", & input);
-    if (g_str_has_prefix (input, "/org/debian/apt/transaction/") == TRUE){
-      g_debug ("Active Transactions signal - input is null = %i", input == NULL);
+    gchar* current = NULL;
+    g_debug ("ActiveTransactionsChanged");
+
+    //gchar** queued = NULL;
+    g_variant_get(value, "s", &current);
+    if (g_str_has_prefix (current, "/org/debian/apt/transaction/") == TRUE){
+      g_debug ("ActiveTransactionsChanged - current is %s", current);
       
       if (self->current_transaction != NULL)
       {
@@ -385,7 +391,7 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
         self->current_transaction = NULL;
       }
 
-      self->current_transaction = apt_transaction_new (input, REAL);
+      self->current_transaction = apt_transaction_new (current, REAL);
       g_signal_connect (G_OBJECT(self->current_transaction),
                         "state-update",
                         G_CALLBACK(apt_watcher_transaction_state_update_cb), self);              
diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h
index 350fa6d..c5372e4 100644
--- a/src/dbus-shared-names.h
+++ b/src/dbus-shared-names.h
@@ -63,6 +63,5 @@ typedef enum {
 
 #define ICON_DEFAULT              "system-devices-panel"
 #define ICON_RESTART              "system-devices-panel-alert"
-#define GREETER_ICON_DEFAULT      "system-shutdown-panel"
 
 #endif /* __DBUS_SHARED_NAMES_H__ */
diff --git a/src/indicator-session.c b/src/indicator-session.c
index 2b36fdd..aacef49 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -164,19 +164,10 @@ indicator_session_init (IndicatorSession *self)
                                                       
   self->users.label = GTK_LABEL (gtk_label_new (NULL));
 
-  const gchar *greeter_var;
-  greeter_var = g_getenv("INDICATOR_GREETER_MODE");
-
   // devices
   self->devices.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME,
                                                       INDICATOR_SESSION_DBUS_OBJECT));
-  if (g_strcmp0(greeter_var, "1") == 0){
-    self->devices.image = indicator_image_helper (GREETER_ICON_DEFAULT);
-  }
-  else{
-    self->devices.image = indicator_image_helper (ICON_DEFAULT);
-  }
-
+  self->devices.image = indicator_image_helper (ICON_DEFAULT);
   
   gtk_widget_show (GTK_WIDGET(self->devices.menu));
   gtk_widget_show (GTK_WIDGET(self->devices.image));