Code cleanups in HildonTouchSelector

[hildon] / src / hildon-touch-selector.c

diff --git a/src/hildon-touch-selector.c b/src/hildon-touch-selector.c
index 7a7031c..26b7e13 100644 (file)
--- a/src/hildon-touch-selector.c
+++ b/src/hildon-touch-selector.c
@@ -692,9 +692,6 @@ _create_new_column (HildonTouchSelector * selector,
   g_object_set (G_OBJECT (panarea),
                 "initial-hint", FALSE, NULL);
 
-  hildon_pannable_area_set_size_request_policy (HILDON_PANNABLE_AREA (panarea),
-                                                HILDON_SIZE_REQUEST_CHILDREN);
-
   gtk_container_add (GTK_CONTAINER (panarea), GTK_WIDGET (tv));
 
   new_column->priv->model = model;
@@ -1082,8 +1079,8 @@ hildon_touch_selector_prepend_text (HildonTouchSelector * selector,
  * @position: the position to insert @text.
  * @text: A non %NULL text string.
  *
- * Inserts a new entry in particular position of a #HildoTouchSelector created
- * with hildon_touch_selector_new_text().
+ * Inserts a new entry in a particular position of a
+ * #HildonTouchSelector created with hildon_touch_selector_new_text().
  *
  * Since: 2.2
  **/
@@ -1199,26 +1196,20 @@ HildonTouchSelectorColumn*
 hildon_touch_selector_append_text_column (HildonTouchSelector * selector,
                                           GtkTreeModel * model, gboolean center)
 {
-  GtkCellRenderer *renderer = NULL;
-  GValue val = { 0, };
+  gfloat xalign = center ? 0.5 : 0.0;
+  GtkCellRenderer *renderer;
 
   g_return_val_if_fail (HILDON_IS_TOUCH_SELECTOR (selector), NULL);
   g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
 
-  if (model != NULL) {
-    renderer = gtk_cell_renderer_text_new ();
+  renderer = gtk_cell_renderer_text_new ();
 
-    if (center) {
-      g_value_init (&val, G_TYPE_FLOAT);
-      g_value_set_float (&val, 0.5);
-      g_object_set_property (G_OBJECT (renderer), "xalign", &val);
-    }
+  g_object_set (renderer,
+                "xalign", xalign,
+                NULL);
 
-    return hildon_touch_selector_append_column (selector, model, renderer,
-                                                "text", 0, NULL);
-  } else {
-    return NULL;
-  }
+  return hildon_touch_selector_append_column (selector, model, renderer,
+                                              "text", 0, NULL);
 }
 
 /**
@@ -1576,9 +1567,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];