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

[bcameron svn gnome org]

Author: bcameron
Date: Wed Dec 17 20:00:39 2008
New Revision: 6646
URL: http://svn.gnome.org/viewvc/gdm?rev=6646&view=rev

Log:
2008-12-17 Brian Cameron <brian cameron sun com>

        * gui/simple-greeter/gdm-option-widget.c: Fix so that the option
          widget will be marked hidden if there are no middle rows.  This
          fixes a problem where the layout widget was showing up even though
          it had no middle entries.  Note a bottom row is added to the layout
          widget in the function gdm_layout_option_widget_init, so empty
          widgets can have a bottom row.  Fixes bug #564789.


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

Modified: trunk/gui/simple-greeter/gdm-option-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-option-widget.c	(original)
+++ trunk/gui/simple-greeter/gdm-option-widget.c	Wed Dec 17 20:00:39 2008
@@ -618,9 +618,10 @@
 static gboolean
 gdm_option_widget_check_visibility (GdmOptionWidget *widget)
 {
-        if (widget->priv->number_of_top_rows > 0 ||
-            widget->priv->number_of_middle_rows > 1 || 
-            widget->priv->number_of_bottom_rows > 0) {
+        if ((widget->priv->number_of_middle_rows != 0) &&
+            (widget->priv->number_of_top_rows > 0 ||
+             widget->priv->number_of_middle_rows > 1 || 
+             widget->priv->number_of_bottom_rows > 0)) {
                 gtk_widget_show (widget->priv->items_combo_box);
                 gtk_widget_show (widget->priv->label);