ayatana-commits team mailing list archive

[Conor Curran <conor.curran@xxxxxxxxxxxxx>]

Conor Curran has proposed merging lp:~cjcurran/indicator-session/remove-icon into lp:indicator-session.

Requested reviews:
  Ted Gould (ted)

For more details, see:
https://code.launchpad.net/~cjcurran/indicator-session/remove-icon/+merge/72710

removes the icon for the user menu on the panel under instruction from MPT
-- 
https://code.launchpad.net/~cjcurran/indicator-session/remove-icon/+merge/72710
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2011-08-22 13:05:48 +0000
+++ src/indicator-session.c	2011-08-24 12:47:30 +0000
@@ -62,7 +62,7 @@
 
 struct _IndicatorSession {
 	IndicatorObject parent;
-	IndicatorServiceManager * service;
+	IndicatorServiceManager *service;
   IndicatorObjectEntry users;
   IndicatorObjectEntry devices;
   gboolean show_users_entry;
@@ -136,32 +136,10 @@
                    INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE,
                    G_CALLBACK(service_connection_cb), self);
 
-  GtkWidget* avatar_icon = NULL;
   // users
   self->users.menu =  GTK_MENU (dbusmenu_gtkmenu_new (INDICATOR_USERS_DBUS_NAME,
                                                       INDICATOR_USERS_DBUS_OBJECT));
-  // Set the image to the default avator image
-  GdkPixbuf* pixbuf  = NULL; 
-  GError* error = NULL;
-  pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-                                     "avatar-default",
-                                     17,
-                                     GTK_ICON_LOOKUP_FORCE_SIZE,
-                                     &error);
-  
-  // I think the avatar image is available always but just in case have a fallback
-  if (error != NULL) {
-    g_warning ("Could not load the default avatar image for some reason");
-    self->users.image = indicator_image_helper (USER_ITEM_ICON_DEFAULT);
-  }
-  else{
-    avatar_icon = gtk_image_new ();
-    gtk_image_set_from_pixbuf (GTK_IMAGE (avatar_icon), pixbuf);
-    self->users.image = GTK_IMAGE (avatar_icon);
-    g_object_unref (pixbuf);
-    g_error_free (error);
-  }
-                                                      
+                                                        
   self->users.label = GTK_LABEL (gtk_label_new (NULL));
 
   // devices

=== modified file 'src/user-menu-mgr.c'
--- src/user-menu-mgr.c	2011-08-23 11:51:51 +0000
+++ src/user-menu-mgr.c	2011-08-24 12:47:30 +0000
@@ -49,6 +49,9 @@
 static void activate_online_accounts (DbusmenuMenuitem *mi,
                                       guint timestamp,
                                       gpointer user_data);
+static void activate_user_accounts (DbusmenuMenuitem *mi,
+                                    guint timestamp,
+                                    gpointer user_data);                                                                            
 static void user_menu_mgr_rebuild_items (UserMenuMgr *self,
                                          gboolean greeter_mode);
 static gboolean check_new_session ();