gdm r6572 - in trunk: . gui/user-switch-applet

[mccann svn gnome org]

Author: mccann
Date: Thu Oct 16 00:14:18 2008
New Revision: 6572
URL: http://svn.gnome.org/viewvc/gdm?rev=6572&view=rev

Log:
2008-10-15  William Jon McCann  <jmccann redhat com>

	* gui/user-switch-applet/applet.c (reset_icon),
	(setup_current_user):
	Remove the user icon from the top menu bar.



Modified:
   trunk/ChangeLog
   trunk/gui/user-switch-applet/applet.c

Modified: trunk/gui/user-switch-applet/applet.c
==============================================================================
--- trunk/gui/user-switch-applet/applet.c	(original)
+++ trunk/gui/user-switch-applet/applet.c	Thu Oct 16 00:14:18 2008
@@ -992,15 +992,6 @@
                 return;
         }
 
-        pixbuf = gdm_user_render_icon (adata->user, adata->panel_size);
-        if (pixbuf == NULL) {
-                return;
-        }
-
-        image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (adata->menuitem));
-        gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-        g_object_unref (pixbuf);
-
         if (adata->user_item != NULL) {
                 image = gdm_entry_menu_item_get_image (GDM_ENTRY_MENU_ITEM (adata->user_item));
                 pixbuf = gdm_user_render_icon (adata->user, adata->panel_size * 2);
@@ -1059,8 +1050,6 @@
         adata->menuitem = gtk_image_menu_item_new_with_label (name);
         label = GTK_BIN (adata->menuitem)->child;
         _gtk_label_make_bold (GTK_LABEL (label));
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->menuitem),
-                                       gtk_image_new ());
         gtk_menu_shell_append (GTK_MENU_SHELL (adata->menubar), adata->menuitem);
         gtk_widget_show (adata->menuitem);