2009-01-14 Alberto Garcia <agarcia@igalia.com>

* src/hildon-picker-dialog.c (hildon_picker_dialog_show): Decide
	whether to show or not the 'Done' button each time the dialog is
	shown, as it depends on the HildonTouchSelector selection mode.

	Fixes: NB#96226 (In multiple selection mode Done button is shown
	sometimes in listpicker)

diff --git a/ChangeLog b/ChangeLog
index f49ed96..360857b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-14  Alberto Garcia  <agarcia@igalia.com>
+
+       * src/hildon-picker-dialog.c (hildon_picker_dialog_show): Decide
+       whether to show or not the 'Done' button each time the dialog is
+       shown, as it depends on the HildonTouchSelector selection mode.
+
+       Fixes: NB#96226 (In multiple selection mode Done button is shown
+       sometimes in listpicker)
+
 2009-01-14  Claudio Saavedra  <csaavedra@igalia.com>
 
        * src/hildon-picker-dialog.c: (_save_current_selection): Do not query

diff --git a/src/hildon-picker-dialog.c b/src/hildon-picker-dialog.c
index e803593..c22183e 100644 (file)
--- a/src/hildon-picker-dialog.c
+++ b/src/hildon-picker-dialog.c
@@ -243,7 +243,11 @@ hildon_picker_dialog_finalize (GObject *object)
 static void
 hildon_picker_dialog_show                       (GtkWidget *widget)
 {
-  _save_current_selection (HILDON_PICKER_DIALOG (widget));
+  HildonPickerDialog *dialog = HILDON_PICKER_DIALOG (widget);
+
+  _save_current_selection (dialog);
+
+  setup_interaction_mode (dialog);
 
   GTK_WIDGET_CLASS (hildon_picker_dialog_parent_class)->show (widget);
 }