Merge lp:~stolowski/unity-lens-applications/use-libgnome-menu3 into lp:unity-lens-applications

[Paweł Stołowski]

Migrated the code to libgnome-menu-3 API. Require valac 0.18.

Migrated the code to libgnome-menu-3 API. Require valac 0.18 (because there is no lignome-menu-3 vapi for earlier valac).

[Michal Hruby (mhr3)]

Looking good. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/3/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/4/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/5/console

review: Needs Fixing (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2012-10-10 09:22:14 +0000
+++ configure.ac	2012-10-22 15:00:28 +0000
@@ -15,7 +15,7 @@
 # Init the other things we depend on
 #############################################
 AM_MAINTAINER_MODE
-AM_PROG_VALAC([0.16.0])
+AM_PROG_VALAC([0.18.0])
 AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
 AC_PROG_CC
 AC_PROG_CXX
@@ -65,7 +65,7 @@
                   dee-1.0 >= 0.5.16
                   zeitgeist-1.0 >= 0.3.8
                   unity >= 6.7.0
-                  libgnome-menu)
+                  libgnome-menu-3.0 >= 3.6.0)
 
 AC_SUBST(LENS_DAEMON_CFLAGS)
 AC_SUBST(LENS_DAEMON_LIBS)

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-10-15 08:16:11 +0000
+++ src/Makefile.am	2012-10-22 15:00:28 +0000
@@ -35,7 +35,7 @@
   --pkg zeitgeist-1.0 \
   --pkg unity \
   --pkg gee-1.0 \
-  --pkg libgnome-menu \
+  --pkg libgnome-menu-3.0 \
   --pkg unity-package-search \
   --pkg unity-ratings-db \
   --target-glib=2.26 \
@@ -72,7 +72,7 @@
   $(NULL)
 
 unity-package-search.o : $(srcdir)/unity-package-search.cc $(srcdir)/unity-package-search.h
-	$(AM_V_GEN)$(CXX) -g $(unity_package_search_libs) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu unity gee-1.0` -c $(srcdir)/unity-package-search.cc
+	$(AM_V_GEN)$(CXX) -g $(unity_package_search_libs) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0` -c $(srcdir)/unity-package-search.cc
 
 unity-ratings-db.o : $(srcdir)/unity-ratings-db.c $(srcdir)/unity-ratings-db.h
 	$(AM_V_CC)$(CC) -g $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(srcdir)/unity-ratings-db.c

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-10-16 10:33:26 +0000
+++ src/daemon.vala	2012-10-22 15:00:28 +0000
@@ -354,10 +354,19 @@
          * the Installed and Availabale categorys. If a NoDisplay app is installed,
          * eg. Evince, it wont otherwise be in the menu index, only in the
          * S-C index - thus show up in the Available category */
-        app_menu = GMenu.Tree.lookup ("unity-lens-applications.menu",
-                                      GMenu.TreeFlags.INCLUDE_NODISPLAY);
-
-        app_menu.add_monitor ((menu) => {
+        app_menu = new GMenu.Tree ("unity-lens-applications.menu",
+                                        GMenu.TreeFlags.INCLUDE_NODISPLAY);
+
+        try
+        {
+          app_menu.load_sync (); //FIXME: libgnome-menu doesn't provide async method (yet?)
+        }
+        catch (GLib.Error e)
+        {
+          warning ("Failed to load menu entries: %s", e.message);
+        }
+
+        app_menu.changed.connect (() => {
             /* Reschedule the timeout if we already have one. The menu tree triggers
              * many change events during app installation. This way we wait the full
              * delay *after* the last change event has triggered */

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2012-10-09 15:26:49 +0000
+++ src/unity-package-search.cc	2012-10-22 15:00:28 +0000
@@ -137,11 +137,14 @@
 static void
 index_menu_item (Xapian::WritableDatabase *db,
                  Xapian::TermGenerator    *indexer,
-                 GMenuTreeItem            *item)
+                 GMenuTreeDirectory       *item)
 {
-  Xapian::Document      doc;
-  GSList               *iter;
   GMenuTreeEntry       *entry;
+  GMenuTreeDirectory *dir;
+  GMenuTreeIter *iter;
+  GDesktopAppInfo *info;
+  GAppInfo *app_info;
+  GMenuTreeItemType item_type;
   UnityAppInfoManager  *appman;
   gchar               **cats, **keywords;
   gchar                *dum1, *dum2, *dum3;
@@ -151,47 +154,59 @@
   g_return_if_fail (indexer != NULL);
   g_return_if_fail (item != NULL);
 
-  switch (gmenu_tree_item_get_type (item))
+  iter = gmenu_tree_directory_iter (item);
+  while ((item_type = gmenu_tree_iter_next (iter)) != GMENU_TREE_ITEM_INVALID)
   {
-    case GMENU_TREE_ITEM_INVALID:
-      return;
+    Xapian::Document      doc;
+
+    switch (item_type)
+    {
     case GMENU_TREE_ITEM_DIRECTORY:
       /* Recurse into directory */
-      iter = gmenu_tree_directory_get_contents (GMENU_TREE_DIRECTORY (item));
-      for (; iter != NULL; iter = iter->next)
-      {
-        index_menu_item (db, indexer, GMENU_TREE_ITEM (iter->data));
-      }
+      dir = gmenu_tree_iter_get_directory (iter);
+      index_menu_item (db, indexer, dir);
       break;
     case GMENU_TREE_ITEM_ENTRY:
       /* Add this entry to the index */
-      entry = GMENU_TREE_ENTRY (item);
+      entry = gmenu_tree_iter_get_entry (iter);
+      info = gmenu_tree_entry_get_app_info (entry);
+      app_info = G_APP_INFO (info);
 
       /* Store relevant values */
-      if (gmenu_tree_entry_get_display_name (entry))
-        doc.add_value (XAPIAN_VALUE_APPNAME, gmenu_tree_entry_get_display_name (entry));
-      if (gmenu_tree_entry_get_icon (entry))
-        doc.add_value (XAPIAN_VALUE_ICON, gmenu_tree_entry_get_icon (entry));
+      if (g_app_info_get_display_name (app_info))
+        doc.add_value (XAPIAN_VALUE_APPNAME, g_app_info_get_display_name (app_info));
+
+      if (g_app_info_get_icon (app_info))
+      {
+        gchar *icon_str = g_icon_to_string (g_app_info_get_icon (app_info));
+        if (icon_str != NULL)
+        {
+          doc.add_value (XAPIAN_VALUE_ICON, icon_str);
+          g_free (icon_str);
+        }
+      }
       if (gmenu_tree_entry_get_desktop_file_id (entry))
+      {
         doc.add_value (XAPIAN_VALUE_DESKTOP_FILE, gmenu_tree_entry_get_desktop_file_id (entry));
-      
+      }
+
       /* Index full text data */
       indexer->set_document(doc);
-      if (gmenu_tree_entry_get_display_name (entry))
-      {
-        dum1 = unity_applications_lens_utils_preprocess_string (gmenu_tree_entry_get_display_name (entry));
-        indexer->index_text(dum1, 5);
-        g_free (dum1);
-      }
-      if (gmenu_tree_entry_get_name (entry))
-      {
-        dum1 = unity_applications_lens_utils_preprocess_string (gmenu_tree_entry_get_name (entry));
-        indexer->index_text(dum1, 5);
-        g_free (dum1);
-      }
-      if (gmenu_tree_entry_get_comment (entry))
-      {
-        dum1 = unity_applications_lens_utils_preprocess_string (gmenu_tree_entry_get_comment (entry));
+      if (g_app_info_get_display_name (app_info))
+      {
+        dum1 = unity_applications_lens_utils_preprocess_string (g_app_info_get_display_name (app_info));
+        indexer->index_text(dum1, 5);
+        g_free (dum1);
+      }
+      if (g_app_info_get_name (app_info))
+      {
+        dum1 = unity_applications_lens_utils_preprocess_string (g_app_info_get_name (app_info));
+        indexer->index_text(dum1, 5);
+        g_free (dum1);
+      }
+      if (g_app_info_get_description (app_info))
+      {
+        dum1 = unity_applications_lens_utils_preprocess_string (g_app_info_get_description (app_info));
         indexer->index_text (dum1, 0);
         g_free (dum1);
       }
@@ -232,18 +247,18 @@
       doc.add_term ("ATapplication");
 
       /* Index application names */
-      dum1 = (gchar *) gmenu_tree_entry_get_display_name (entry); // const
+      dum1 = (gchar *) g_app_info_get_display_name (app_info);
       dum2 = g_strconcat ("AA", dum1, NULL);
       doc.add_term (dum2);
       g_free (dum2);
 
-      dum1 = (gchar *) gmenu_tree_entry_get_name (entry); // const
+      dum1 = (gchar *) g_app_info_get_name (app_info);
       dum2 = g_strconcat ("AA", dum1, NULL);
       doc.add_term (dum2);
       g_free (dum2);
 
       /* Index executable name, change - in _ for exec */
-      dum1 = g_strdup (gmenu_tree_entry_get_exec (entry)); // alloc
+      dum1 = g_strdup (g_app_info_get_commandline (app_info)); // alloc
       if (dum1)
       {
         dum2 = strstr (dum1, " "); // const
@@ -268,8 +283,9 @@
     case GMENU_TREE_ITEM_ALIAS:
       break;
     default:
-      g_warning ("Unexpected GMenuTreeItemType %u", gmenu_tree_item_get_type (item));
-      return;
+      g_warning ("Unexpected GMenuTreeItemType %u", item_type);
+      break;
+    }
   }
 
   // Add the document to the database.
@@ -292,8 +308,7 @@
 
   /* Index the menu recursively */
   Xapian::TermGenerator *indexer = new Xapian::TermGenerator ();
-  index_menu_item (db, indexer,
-                   GMENU_TREE_ITEM (gmenu_tree_get_root_directory (menu)));
+  index_menu_item (db, indexer, gmenu_tree_get_root_directory (menu));
   delete indexer;
   db->flush ();
 
@@ -336,7 +351,7 @@
   }
 
   init_searcher (searcher);
-  
+
   return searcher;
 }
 
@@ -672,7 +687,7 @@
       g_warning ("List should have even list of arguments");
       return NULL;
     }
-    
+
     const string pkgname = ((char *)iter->data);
     Xapian::Query query1 ("AA" + appname);
     Xapian::Query query2 ("AP" + pkgname);

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2012-10-12 09:56:12 +0000
+++ tests/unit/Makefile.am	2012-10-22 15:00:28 +0000
@@ -93,7 +93,7 @@
 nodist_test_software_center_details_SOURCES = $(test_software_center_details_VALASOURCES:.vala=.c)
 
 unity-package-search.o : $(top_srcdir)/src/unity-package-search.cc $(top_srcdir)/src/unity-package-search.h
-	$(AM_V_GEN)$(CXX) -g $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu unity gee-1.0` -c $(top_srcdir)/src/unity-package-search.cc
+	$(AM_V_GEN)$(CXX) -g $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0` -c $(top_srcdir)/src/unity-package-search.cc
 
 CLEANFILES = *.stamp \
 	  $(test_software_center_data_cache_VALASOURCES:.vala=.c) \

=== modified file 'vapi/unity-package-search.deps'
--- vapi/unity-package-search.deps	2010-09-02 10:48:11 +0000
+++ vapi/unity-package-search.deps	2012-10-22 15:00:28 +0000
@@ -1,3 +1,2 @@
 glib-2.0
-libgnome-menu
-
+libgnome-menu-3.0