From: Jose Dapena Paz Date: Sat, 5 Sep 2009 11:00:27 +0000 (+0200) Subject: Additional check in sort dialog (code review). X-Git-Tag: 3.0.17-rc52~14 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=2ead225b46b1b43497890b6a040524fa27144448 Additional check in sort dialog (code review). * src/hildon2/modest-hildon2-sort-dialog.c (modest_hildon2_sort_dialog_get_sort_order): additional check on retrieving currently selected sort criteria in selector. If there's no selection return criteria of first element (fixes NB#136381). --- diff --git a/src/hildon2/modest-hildon2-sort-dialog.c b/src/hildon2/modest-hildon2-sort-dialog.c index 688ae4a..332cfab 100644 --- a/src/hildon2/modest-hildon2-sort-dialog.c +++ b/src/hildon2/modest-hildon2-sort-dialog.c @@ -274,9 +274,12 @@ modest_hildon2_sort_dialog_get_sort_order (ModestSortCriteriumView *self) g_return_val_if_fail (MODEST_IS_HILDON2_SORT_DIALOG (self), GTK_SORT_ASCENDING); selector = hildon_picker_dialog_get_selector (HILDON_PICKER_DIALOG (self)); - hildon_touch_selector_get_selected (selector, 0, &iter); - model = hildon_touch_selector_get_model (selector, 0); + + if (!hildon_touch_selector_get_selected (selector, 0, &iter)) { + g_return_val_if_fail (gtk_tree_model_get_iter_first (model, &iter), GTK_SORT_ASCENDING); + } + gtk_tree_model_get (model, &iter, ID_COLUMN, &id, -1); switch (id) {