r3796 - in trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
chris at sita.openmoko.org
chris at sita.openmoko.org
Wed Jan 9 16:07:32 CET 2008
Author: chris
Date: 2008-01-09 16:07:31 +0100 (Wed, 09 Jan 2008)
New Revision: 3796
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
Log:
* src/sms-utils.c: (sms_select_contact):
Clear current search/group and convert to filter iter before selecting
contact
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog 2008-01-09 14:38:23 UTC (rev 3795)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog 2008-01-09 15:07:31 UTC (rev 3796)
@@ -1,5 +1,11 @@
2008-01-09 Chris Lord <chris at openedhand.com>
+ * src/sms-utils.c: (sms_select_contact):
+ Clear current search/group and convert to filter iter before selecting
+ contact
+
+2008-01-09 Chris Lord <chris at openedhand.com>
+
* configure.ac:
* data/Makefile.am:
* data/org.openmoko.OpenmokoMessages2.service.in:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c 2008-01-09 14:38:23 UTC (rev 3795)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c 2008-01-09 15:07:31 UTC (rev 3796)
@@ -19,6 +19,8 @@
#include "sms-contacts.h"
#include "sms-utils.h"
+#include <string.h>
+#include <libmokoui2/moko-search-bar.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -45,10 +47,32 @@
&iter, COL_UID, &iter_uid, -1);
if (iter_uid && (strcmp (uid, iter_uid) == 0)) {
+ GtkTreeIter filter_iter;
+
+ /* Reset filter */
+ if (moko_search_bar_search_visible (MOKO_SEARCH_BAR (
+ data->contacts_search))) {
+ gtk_entry_set_text (moko_search_bar_get_entry (
+ MOKO_SEARCH_BAR(data->contacts_search)),
+ "");
+ } else {
+ gtk_combo_box_set_active (
+ moko_search_bar_get_combo_box (
+ MOKO_SEARCH_BAR(data->contacts_search)),
+ 0);
+ }
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (
+ data->contacts_filter));
+
+ gtk_tree_model_filter_convert_child_iter_to_iter (
+ GTK_TREE_MODEL_FILTER (data->contacts_filter),
+ &filter_iter, &iter);
+
g_free (iter_uid);
selection = gtk_tree_view_get_selection (
GTK_TREE_VIEW (data->contacts_treeview));
- gtk_tree_selection_select_iter (selection, &iter);
+ gtk_tree_selection_select_iter (
+ selection, &filter_iter);
return TRUE;
}
More information about the commitlog
mailing list