2009-04-07 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-touch-selector.c (hildon_touch_selector_get_active):
	Check the return value of gtk_tree_selection_get_selected() for
	safety.

diff --git a/ChangeLog b/ChangeLog
index 324faa3..b5edc5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-07  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * src/hildon-touch-selector.c (hildon_touch_selector_get_active):
+       Check the return value of gtk_tree_selection_get_selected()
+       for safety.
+
 2009-04-06  Alberto Garcia  <agarcia@igalia.com>
 
        * src/hildon-animation-actor.c

diff --git a/src/hildon-touch-selector.c b/src/hildon-touch-selector.c
index 7a7031c..6c6ba34 100644 (file)
--- a/src/hildon-touch-selector.c
+++ b/src/hildon-touch-selector.c
@@ -1576,9 +1576,9 @@ hildon_touch_selector_get_active                (HildonTouchSelector *selector,
   current_column = g_slist_nth_data (selector->priv->columns, column);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (current_column->priv->tree_view));
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (current_column->priv->tree_view));
+  g_return_val_if_fail (gtk_tree_selection_get_selected (selection, NULL, &iter), -1);
 
-  gtk_tree_selection_get_selected (selection, NULL, &iter);
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (current_column->priv->tree_view));
   path = gtk_tree_model_get_path (model, &iter);
   index = (gtk_tree_path_get_indices (path))[0];