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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-09 15:41:12 +0100 (Fri, 09 Nov 2007)
New Revision: 3384

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/package-store.c
Log:
* src/package-store.c: (package_store_new): Filter out dbg,dev,doc and
  locale packages from the main package list.


Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog	2007-11-09 10:18:19 UTC (rev 3383)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/ChangeLog	2007-11-09 14:41:12 UTC (rev 3384)
@@ -1,5 +1,10 @@
 2007-11-09  Thomas Wood  <thomas at openedhand.com>
 
+	* src/package-store.c: (package_store_new): Filter out dbg,dev,doc and
+	  locale packages from the main package list.
+
+2007-11-09  Thomas Wood  <thomas at openedhand.com>
+
 	* src/search-bar.c: (search_bar_new): Sort the categories before adding
 	 to the combobox
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/package-store.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/package-store.c	2007-11-09 10:18:19 UTC (rev 3383)
+++ trunk/src/target/OM-2007.2/applications/openmoko-appmanager2/src/package-store.c	2007-11-09 14:41:12 UTC (rev 3384)
@@ -28,6 +28,7 @@
   IPK_PACKAGE *pkg;
   PKG_LIST_HEAD list;
   int ret;
+  GRegex *regex;
   
   ipkg_initialize (0);
   
@@ -40,15 +41,20 @@
   
   pkg = list.pkg_list;
   
+  regex = g_regex_new ("(-doc$|-dev$|-dbg$|-locale)", G_REGEX_OPTIMIZE, 0, NULL);
+  
   while (pkg)
   {
-    gtk_list_store_insert_with_values (store, NULL, -1,
+    if (!g_regex_match (regex, pkg->name, 0, NULL))
+      gtk_list_store_insert_with_values (store, NULL, -1,
                                        COL_STATUS, pkg->state_status,
                                        COL_NAME, pkg->name,
                                        COL_POINTER, pkg,
                                        -1);
     pkg = pkg->next;
   }
+  
+  g_regex_unref (regex);
 
   return GTK_TREE_MODEL (store);
 }