Merge lp:~kamstrup/libunity/now-with-more-keywords into lp:libunity

[Mikkel Kamstrup Erlandsen]

Support the new standard XDG 'Keywords' field in desktop files

[Michal Hruby (mhr3)]

Gio dropped support for the gnome-specific key, shouldn't we as well? (http://mail.gnome.org/archives/commits-list/2011-December/msg06472.html)

review: Needs Information

[Mikkel Kamstrup Erlandsen (kamstrup)]

I think we should keep it in for backwards compat. It is more or less free efficiency wise. Also - we still ship a truckload of packages using the X-GNOME-Keywords field.

[Michal Hruby (mhr3)]

Grepping through my /usr/share/applications shows the key to be mostly gone, but yea, there are still a few non-core-gnome apps using it.

review: Approve

=== modified file 'src/unity-appinfo-manager.vala'
--- src/unity-appinfo-manager.vala	2011-12-06 11:59:22 +0000
+++ src/unity-appinfo-manager.vala	2012-02-27 09:12:17 +0000
@@ -389,6 +389,8 @@
     {
       string[] gkeywords;
       string[] akeywords;
+      string[] xdgkeywords;
+      
       try {
         gkeywords = keyfile.get_locale_string_list ("Desktop Entry",
                                                     "X-GNOME-Keywords");
@@ -403,9 +405,16 @@
         /* Unknown key or group. This app has no X-GNOME-Keywords */
         akeywords = new string[0];
       }
+      try {
+        xdgkeywords = keyfile.get_locale_string_list ("Desktop Entry",
+                                                      "Keywords");
+      } catch (KeyFileError e) {
+        /* Unknown key or group. This app has no standard Keywords */
+        xdgkeywords = new string[0];
+      }
           
       /* Copy the two keyword types into one 'keyword' array */
-      string[] keywords = new string[gkeywords.length + akeywords.length];
+      string[] keywords = new string[gkeywords.length + akeywords.length + xdgkeywords.length];
       for (int i = 0; i < gkeywords.length; i++)
       {
         keywords[i] = gkeywords[i];
@@ -414,6 +423,10 @@
       {
         keywords[gkeywords.length + i] = akeywords[i];
       }
+      for (int i = 0; i < xdgkeywords.length; i++)
+      {
+        keywords[gkeywords.length + akeywords.length + i] = xdgkeywords[i];
+      }
           
       var wrapper = new StringArrayWrapper();
       wrapper.take_strings ((owned) keywords);

=== modified file 'test/data/applications/ubuntu-about.desktop'
--- test/data/applications/ubuntu-about.desktop	2011-09-27 09:48:39 +0000
+++ test/data/applications/ubuntu-about.desktop	2012-02-27 09:12:17 +0000
@@ -11,3 +11,5 @@
 X-Ubuntu-Gettext-Domain=gnome-panel-2.0
 X-GNOME-Keywords=about;ubuntu;help
 X-AppInstall-Keywords=testkeyword
+Keywords=thisisnotthekeywordsyourelookingfor;neitheristhis
+

=== modified file 'test/vala/test-appinfo-manager.vala'
--- test/vala/test-appinfo-manager.vala	2011-12-06 11:59:22 +0000
+++ test/vala/test-appinfo-manager.vala	2012-02-27 09:12:17 +0000
@@ -108,11 +108,13 @@
       
       string[]? keywords = manager.get_keywords ("ubuntu-about.desktop");
       assert (keywords != null);
-      assert (keywords.length == 4);
+      assert (keywords.length == 6);
       assert (keywords[0] == "about");
       assert (keywords[1] == "ubuntu");
       assert (keywords[2] == "help");
       assert (keywords[3] == "testkeyword");
+      assert (keywords[4] == "thisisnotthekeywordsyourelookingfor");
+      assert (keywords[5] == "neitheristhis");
       
       string path = manager.get_path ("ubuntu-about.desktop");
       string abs_path = File.new_for_path(Config.TESTDIR).resolve_relative_path("data/applications/ubuntu-about.desktop").get_path();
@@ -147,11 +149,13 @@
       
       string[]? keywords = manager.get_keywords ("ubuntu-about.desktop");
       assert (keywords != null);
+      assert (keywords.length == 6);
       assert (keywords[0] == "about");
       assert (keywords[1] == "ubuntu");
       assert (keywords[2] == "help");
       assert (keywords[3] == "testkeyword");
-      assert (keywords.length == 4);
+      assert (keywords[4] == "thisisnotthekeywordsyourelookingfor");
+      assert (keywords[5] == "neitheristhis");
 
       string path = manager.get_path ("ubuntu-about.desktop");
       string abs_path = File.new_for_path(Config.TESTDIR).resolve_relative_path("data/applications/ubuntu-about.desktop").get_path();