summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2008-10-01 14:38:20 +0000
committerRay Strode <halfline@src.gnome.org>2008-10-01 14:38:20 +0000
commit2c29881594d1b369cc77472b3f753ba84bef9add (patch)
tree13c15d2c84e8077bcf356ed93e1b7a8aa1dd4f79
parent6d2672423bf72d4d43a1ab21fac19bd9b153ca6d (diff)
downloadgdm-2c29881594d1b369cc77472b3f753ba84bef9add.tar.gz
Don't crash if active_row is invalid
2008-10-01 Ray Strode <rstrode@redhat.com> * gui/simple-greeter/gdm-option-widget.c (get_active_item_id): Don't crash if active_row is invalid svn path=/trunk/; revision=6556
-rw-r--r--ChangeLog6
-rw-r--r--gui/simple-greeter/gdm-option-widget.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15ecc088..081cdf10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-10-01 Ray Strode <rstrode@redhat.com>
+ * gui/simple-greeter/gdm-option-widget.c
+ (get_active_item_id): Don't crash if
+ active_row is invalid
+
+2008-10-01 Ray Strode <rstrode@redhat.com>
+
* gui/simple-greeter/gdm-languages.c
(make_codeset_canonical_for_locale),
(gdm_normalize_language_name):
diff --git a/gui/simple-greeter/gdm-option-widget.c b/gui/simple-greeter/gdm-option-widget.c
index f8ec8c87..e87ab7f1 100644
--- a/gui/simple-greeter/gdm-option-widget.c
+++ b/gui/simple-greeter/gdm-option-widget.c
@@ -148,7 +148,8 @@ get_active_item_id (GdmOptionWidget *widget,
model = GTK_TREE_MODEL (widget->priv->list_store);
item_id = NULL;
- if (widget->priv->active_row == NULL) {
+ if (widget->priv->active_row == NULL ||
+ !gtk_tree_row_reference_valid (widget->priv->active_row)) {
return NULL;
}