Merge lp:~therigu/unity-lens-applications/menu-entries-without-categories into lp:unity-lens-applications

[Adam Guthrie]

Allow gmenu entries without categories in their respective .desktop files to be indexed whilst still protecting against the case where unity cannot retrieve information from said .desktop file. LP: #635223

[Mikkel Kamstrup Erlandsen (kamstrup)]

Considering the conclusions on the linked bug - i'll re-review this once we are out of Maverick release frenzy.

Sorry to keep you waiting. I assure you that your work is much appreciated!

[Mikkel Kamstrup Erlandsen (kamstrup)]

Finally some updates! :-)

I need to disapprove this branch as the underlying codebase for the apps place has shifted somewhat since this branch' inception. The good news is that I have applied the same approach in another branch, and together with the a patch to Unity have Wine apps working here now :-)

So thanks for pioneering this Adam!

review: Disapprove

Unmerged revisions

100. By Adam Guthrie on 2010-09-18

Allow gmenu entries without categories in their respective .desktop files to indexed whilst still protecting against the case where unity cannot retrieve information from said .desktop file.

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2010-09-14 11:30:09 +0000
+++ src/unity-package-search.cc	2010-09-18 13:41:47 +0000
@@ -92,6 +92,7 @@
   GMenuTreeEntry      *entry;
   UnityAppInfoManager *appman;
   GeeList             *cats;
+  GAppInfo            *appinfo;
   GeeIterator         *cats_iter;
   gchar               *dum1, *dum2, *dum3;
 
@@ -138,35 +139,47 @@
 	    
 	    /* Index the XDG categories */
 	    appman = unity_app_info_manager_get_instance ();
-	    cats = unity_app_info_manager_get_categories (appman,
+	    appinfo = unity_app_info_manager_lookup (appman,
 	                                                  gmenu_tree_entry_get_desktop_file_id (entry));
 	    
 	    /* For unknown desktop ids the app info manager returns NULL.
 	     * Also happens for many NoDisplay app infos, so it's not an error
 	     * case as such */
-	    if (cats == NULL)
+	    if (appinfo == NULL)
 	      {
-	        //g_debug ("Unable to probe XDG categories for %s",
-	        //         gmenu_tree_entry_get_desktop_file_id (entry));
+	        g_debug ("Unable to probe info for %s",
+	                 gmenu_tree_entry_get_desktop_file_id (entry));
 	        g_object_unref (appman);
 	        break;
 	      }
-	    
-	    cats_iter = GEE_ITERATOR (gee_list_list_iterator (cats));
-	    while (gee_iterator_next (cats_iter))
-	      {
-	        // FIXME: Free dum1?
-	        dum1 = (gchar*) gee_iterator_get (cats_iter);
-	        dum2 = g_ascii_strdown (dum1, -1);
-	        dum3 = g_strconcat ("AC", dum2, NULL);
-	        doc.add_term (dum3);
-	        g_free (dum1);
-	        g_free (dum2);
-	        g_free (dum3);
-	      }
-	    g_object_unref (cats_iter);
-	    g_object_unref (cats);
-	    g_object_unref (appman);
+
+	    cats = unity_app_info_manager_get_categories (appman,
+	                                                  gmenu_tree_entry_get_desktop_file_id (entry));
+
+	    if (cats == NULL)
+          {
+            //g_debug ("Unable to probe XDG categories for %s",
+            //         gmenu_tree_entry_get_desktop_file_id (entry));
+            g_object_unref (appman);
+          }
+        else 
+          { 
+            cats_iter = GEE_ITERATOR (gee_list_list_iterator (cats));
+            while (gee_iterator_next (cats_iter))
+              {
+                // FIXME: Free dum1?
+                dum1 = (gchar*) gee_iterator_get (cats_iter);
+                dum2 = g_ascii_strdown (dum1, -1);
+                dum3 = g_strconcat ("AC", dum2, NULL);
+                doc.add_term (dum3);
+                g_free (dum1);
+                g_free (dum2);
+                g_free (dum3);
+              }
+            g_object_unref (cats_iter);
+            g_object_unref (cats);
+            g_object_unref (appman);
+          }
 	    
 	    /* Always assume Type=Application for items in a menu... */
 	    doc.add_term ("ATapplication");