Import upstream version 0.3.0

1 files changed, 7 insertions, 12 deletions

diff --git a/src/indicator-session.c b/src/indicator-session.c
index 068ffef..d7155f6 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -6,7 +6,8 @@ Copyright 2009 Canonical Ltd.
 
 Authors:
     Ted Gould <ted@canonical.com>
-
+    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.
@@ -20,7 +21,6 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-//TODO - remember to reinsert Ted's comments.
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -444,22 +444,19 @@ user_menu_visibility_get_cb (GObject* obj, GAsyncResult* res, gpointer user_data
   // If it is what we had before no need to do anything...
   if (self->show_users_entry == update){
     return;
-  }
-  
+  }  
   //Otherwise
   self->show_users_entry = update;
 
-  IndicatorObjectEntry user_entry = self->users;
-  
   if (self->show_users_entry == TRUE){
     g_signal_emit_by_name ((gpointer)self,
                            "entry-added",
-                           &user_entry);   
+                           &self->users);   
   }
   else{
     g_signal_emit_by_name ((gpointer)self,
                            "entry-removed",
-                           &user_entry);       
+                           &self->users);       
   }
 }
 
@@ -489,18 +486,16 @@ receive_signal (GDBusProxy * proxy,
     
     //Otherwise
     self->show_users_entry = update;
-
-    IndicatorObjectEntry user_entry = self->users;
     
     if (self->show_users_entry == TRUE){
       g_signal_emit_by_name ((gpointer)self,
                              "entry-added",
-                             &user_entry);
+                             &self->users);
     }   
     else{
       g_signal_emit_by_name ((gpointer)self,
                              "entry-removed",
-                             &user_entry);       
+                             &self->users);       
     }
   }
 }