r3439 - in trunk/src/target/OM-2007.2/applications/openmoko-appmanager2: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-19 15:01:02 +0100 (Mon, 19 Nov 2007)
New Revision: 3439

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/navigation-area.c
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/search-bar.c
Log:
* src/navigation-area.c: (model_filter_func):
* src/search-bar.c: (text_changed_cb), (combo_changed_cb): Fix text
   searching


Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog	2007-11-19 13:59:28 UTC (rev 3438)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog	2007-11-19 14:01:02 UTC (rev 3439)
@@ -1,3 +1,9 @@
+2007-11-19  Thomas Wood  <thomas at openedhand.com>
+
+	* src/navigation-area.c: (model_filter_func):
+	* src/search-bar.c: (text_changed_cb), (combo_changed_cb): Fix text
+	   searching
+
 2007-11-16  Thomas Wood  <thomas at openedhand.com>
 
 	* src/ipkg-utils.c: (update_package_list):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/navigation-area.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/navigation-area.c	2007-11-19 13:59:28 UTC (rev 3438)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/navigation-area.c	2007-11-19 14:01:02 UTC (rev 3439)
@@ -86,11 +86,11 @@
  
   if (data->searchbar_search_type == SEARCH_ON_SECTION)
   {
-    return (strstr (pkg->name, data->searchbar_needle) != NULL);
+    return (g_str_equal (pkg->section, data->searchbar_needle));
   }
   else if (data->searchbar_search_type == SEARCH_ON_NAME)
   {
-    return (!strcmp (pkg->section, data->searchbar_needle));
+    return (g_strrstr (pkg->name, data->searchbar_needle));
   }
   else if (data->searchbar_search_type == SEARCH_ON_STATUS)
   {

Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/search-bar.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/search-bar.c	2007-11-19 13:59:28 UTC (rev 3438)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/search-bar.c	2007-11-19 14:01:02 UTC (rev 3439)
@@ -42,13 +42,32 @@
   needle = gtk_entry_get_text (entry);
  
   data->searchbar_search_type = SEARCH_ON_NAME;
-  data->searchbar_needle = needle;
+  data->searchbar_needle = g_strdup (needle);
 
+  g_debug ("Search = %s", needle);
+
+
+  GTimer *timer = g_timer_new ();
   filter = gtk_tree_view_get_model (GTK_TREE_VIEW (data->tvpkglist));
   g_object_ref (G_OBJECT (filter));
   gtk_tree_view_set_model (GTK_TREE_VIEW (data->tvpkglist), NULL);
+
+  g_timer_stop (timer);
+  g_debug ("Unsetting model took %f seconds", g_timer_elapsed (timer, NULL));
+  g_timer_start (timer);
+
   gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter));
+
+  g_timer_stop (timer);
+  g_debug ("Search took %f seconds", g_timer_elapsed (timer, NULL));
+  g_timer_start (timer);
+
   gtk_tree_view_set_model (GTK_TREE_VIEW (data->tvpkglist), filter);
+
+  g_timer_stop (timer);
+  g_debug ("Setting model took %f seconds", g_timer_elapsed (timer, NULL));
+  g_timer_destroy (timer);
+
   g_object_unref (G_OBJECT (filter));
 }
 
@@ -91,7 +110,11 @@
   }
 
   filter = gtk_tree_view_get_model (GTK_TREE_VIEW (data->tvpkglist));
+  g_object_ref (filter);
+  gtk_tree_view_set_model (GTK_TREE_VIEW (data->tvpkglist), NULL);
   gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter));
+  gtk_tree_view_set_model (GTK_TREE_VIEW (data->tvpkglist), filter);
+  g_object_unref (filter);
 }
 
 static void