gdm r6135 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Tue Apr  8 04:18:23 2008
New Revision: 6135
URL: http://svn.gnome.org/viewvc/gdm?rev=6135&view=rev

Log:
2008-04-07 Ray Strode <rstrode redhat com>

	* gui/simple-greeter/gdm-user-chooser-widget.c
	(add_user_other), (add_user_auto),
	(gdm_user_chooser_widget_dispose),
	(get_empty_pixbuf):
	* gui/simple-greeter/gdm-chooser-widget.c
	(gdm_chooser_widget_init):
	drop the empty pixbuf and force a fixed
	width and height on the cell renderer instead


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-chooser-widget.c
   trunk/gui/simple-greeter/gdm-user-chooser-widget.c

Modified: trunk/gui/simple-greeter/gdm-chooser-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-chooser-widget.c	(original)
+++ trunk/gui/simple-greeter/gdm-chooser-widget.c	Tue Apr  8 04:18:23 2008
@@ -1555,6 +1555,9 @@
 
         /* IMAGE COLUMN */
         renderer = gtk_cell_renderer_pixbuf_new ();
+        gtk_cell_renderer_set_fixed_size (renderer,
+                                          GDM_CHOOSER_WIDGET_DEFAULT_ICON_SIZE,
+                                          GDM_CHOOSER_WIDGET_DEFAULT_ICON_SIZE);
         column = gtk_tree_view_column_new ();
         gtk_tree_view_column_pack_start (column, renderer, FALSE);
         gtk_tree_view_append_column (GTK_TREE_VIEW (widget->priv->items_view), column);
@@ -1566,7 +1569,6 @@
                                              NULL);
 
         g_object_set (renderer,
-                      "width", GDM_CHOOSER_WIDGET_DEFAULT_ICON_SIZE,
                       "xalign", 1.0,
                       NULL);
 

Modified: trunk/gui/simple-greeter/gdm-user-chooser-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-user-chooser-widget.c	(original)
+++ trunk/gui/simple-greeter/gdm-user-chooser-widget.c	Tue Apr  8 04:18:23 2008
@@ -55,7 +55,6 @@
 
         GdkPixbuf      *logged_in_pixbuf;
         GdkPixbuf      *stock_person_pixbuf;
-        GdkPixbuf      *empty_pixbuf;
 
         guint           show_other_user : 1;
         guint           show_guest_user : 1;
@@ -77,7 +76,7 @@
 {
         gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),
                                      GDM_USER_CHOOSER_USER_OTHER,
-                                     widget->priv->empty_pixbuf,
+                                     NULL,
                                      _("Other..."),
                                      _("Choose a different account"),
                                      0,
@@ -103,7 +102,7 @@
 {
         gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),
                                      GDM_USER_CHOOSER_USER_AUTO,
-                                     widget->priv->empty_pixbuf,
+                                     NULL,
                                      _("Automatic Login"),
                                      _("Automatically login to the system after selecting options"),
                                      0,
@@ -269,11 +268,6 @@
                 g_object_unref (widget->priv->stock_person_pixbuf);
                 widget->priv->stock_person_pixbuf = NULL;
         }
-
-        if (widget->priv->empty_pixbuf != NULL) {
-                g_object_unref (widget->priv->empty_pixbuf);
-                widget->priv->empty_pixbuf = NULL;
-        }
 }
 
 static void
@@ -290,24 +284,6 @@
 }
 
 static GdkPixbuf *
-get_empty_pixbuf (GdmUserChooserWidget *widget)
-{
-        GdkPixbuf *pixbuf;
-        guchar    *pixels;
-        int        row;
-        int        rowstride;
-
-        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, ICON_SIZE, ICON_SIZE);
-        pixels = gdk_pixbuf_get_pixels (pixbuf);
-        rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-        for (row = 0; row < ICON_SIZE; row++) {
-                memset (pixels + row * rowstride, 0, ICON_SIZE * 4);
-        }
-
-        return pixbuf;
-}
-
-static GdkPixbuf *
 get_stock_person_pixbuf (GdmUserChooserWidget *widget)
 {
         GdkPixbuf *pixbuf;
@@ -369,7 +345,6 @@
                 g_object_unref (widget->priv->logged_in_pixbuf);
         }
         widget->priv->logged_in_pixbuf = get_logged_in_pixbuf (widget);
-        widget->priv->empty_pixbuf = get_empty_pixbuf (widget);
 
         old_pixbuf = widget->priv->stock_person_pixbuf;
         widget->priv->stock_person_pixbuf = get_stock_person_pixbuf (widget);