X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-selector-picker.c;h=a8331da25b4be252f42a9629a6a6e063fbb7c603;hb=d53787a7374c935a9e1a52ce19dcd9068984e759;hp=5fb4d86b5ba9b785e91e57b9bbdd68a8f962cd2f;hpb=8e88511ff8e810825a3c79f3f3a3cd0add92e520;p=modest

diff --git a/src/hildon2/modest-selector-picker.c b/src/hildon2/modest-selector-picker.c
index 5fb4d86..a8331da 100644
--- a/src/hildon2/modest-selector-picker.c
+++ b/src/hildon2/modest-selector-picker.c
@@ -104,7 +104,7 @@ modest_selector_picker_finalize (GObject *obj)
 }
 
 static gchar *
-touch_selector_print_func (HildonTouchSelector *selector)
+touch_selector_print_func (HildonTouchSelector *selector, gpointer userdata)
 {
 	GtkTreeIter iter;
 	if (hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (selector), 0, &iter)) {
@@ -155,7 +155,7 @@ create_touch_selector (GtkTreeModel *model)
 					     renderer, "text", COLUMN_DISPLAY_NAME, NULL);
 
 	hildon_touch_selector_set_model (HILDON_TOUCH_SELECTOR(selector), 0, model);
-	hildon_touch_selector_set_print_func (HILDON_TOUCH_SELECTOR (selector), touch_selector_print_func);
+	hildon_touch_selector_set_print_func (HILDON_TOUCH_SELECTOR (selector), (HildonTouchSelectorPrintFunc) touch_selector_print_func);
 
 	return selector;
 }
@@ -180,7 +180,9 @@ modest_selector_picker_set_pair_list (ModestSelectorPicker *self, ModestPairList
 
 
 GtkWidget*
-modest_selector_picker_new (ModestPairList *pairs, GEqualFunc id_equal_func)
+modest_selector_picker_new (HildonSizeType size,
+			    HildonButtonArrangement arrangement,
+			    ModestPairList *pairs, GEqualFunc id_equal_func)
 {
 	GtkTreeModel *model;
 	GObject *obj;
@@ -188,8 +190,8 @@ modest_selector_picker_new (ModestPairList *pairs, GEqualFunc id_equal_func)
 	GtkTreeIter iter;
 
 	obj  = G_OBJECT(g_object_new(MODEST_TYPE_SELECTOR_PICKER,
-				     "size", HILDON_SIZE_AUTO,
-				     "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+				     "size", size,
+				     "arrangement", arrangement,
 				     NULL));
 	priv = MODEST_SELECTOR_PICKER_GET_PRIVATE(obj);
 	
@@ -198,8 +200,9 @@ modest_selector_picker_new (ModestPairList *pairs, GEqualFunc id_equal_func)
 		GtkWidget *selector;
 
 		selector = create_touch_selector (model);
-		gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
-		hildon_touch_selector_select_iter (HILDON_TOUCH_SELECTOR (selector), 0, &iter, TRUE);
+		if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)) {
+			hildon_touch_selector_select_iter (HILDON_TOUCH_SELECTOR (selector), 0, &iter, TRUE);
+		}
 		g_object_unref (model);
 
 		hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (obj), HILDON_TOUCH_SELECTOR (selector));