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

[halfline svn gnome org]

Author: halfline
Date: Wed Feb 27 19:03:01 2008
New Revision: 5887
URL: http://svn.gnome.org/viewvc/gdm?rev=5887&view=rev

Log:
2008-02-27  Ray Strode  <rstrode redhat com>

	* gui/simple-greeter/gdm-option-widget.c:
	(gdm_option_widget_set_default_item): handle NULL item better
	(was causing crash on failed auth)


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 Feb 27 19:03:01 2008
@@ -284,11 +284,12 @@
                                                          NULL, NULL, NULL));
 
         if (widget->priv->default_item_id == NULL ||
+            item == NULL ||
             strcmp (widget->priv->default_item_id, item) != 0) {
                 g_free (widget->priv->default_item_id);
                 widget->priv->default_item_id = NULL;
 
-                if (widget->priv->active_row == NULL) {
+                if (widget->priv->active_row == NULL || item != NULL) {
                     activate_from_item_id (widget, item);
                 }