Merge lp:~ballogy/bamf/fix-current-desktop into lp:bamf/0.4

[Balló György]

This change fixes the following two problems what I experienced while using BAMF on Arch Linux:

1. Fix desktop file table if XDG_CURRENT_DESKTOP environment variable is not available.

Using the vanilla gnome-session without Ubuntu patches, the XDG_CURRENT_DESKTOP is not specified. In this case, all desktop files are ignored which contain the OnlyShowIn property. This isn't the expected behavior, because many GNOME desktop files are ignored in a GNOME session, e.g. nautilus, control center entries. To fix this issue, all desktop files should be added to the desktop file table if no XDG_CURRENT_DESKTOP specified.

2. Fix a critical warning if an empty Exec= line specified in a desktop file.

Without this extra check, the following critical message displayed in this case (e.g. with the unity-scope-gdocs.desktop file):

** (bamfdaemon:20159): CRITICAL **: insert_data_into_tables: assertion `exec' failed

[Marco Trevisan (Treviño) (3v1n0)]

Thanks for your patch.

27 - if (!exec)
28 + if (!exec || exec[0] == '\0')

In the case that (exec[0] == '\0') you also need to free it.

Overall that's fine. Would you mind also to add a small test case into test-matcher.c?

[Balló György (ballogy)]

Unfortunately, I don't know how to write tests.

[Marco Trevisan (Treviño) (3v1n0)]

György: if you look at tests/bamfdaemon/test-matcher.c you could find some examples of how to get that... You could try to do a test like "test_load_desktop_file", but unsetting the XDG_CURRENT_DESKTOP variable before running it.

[Balló György (ballogy)]

Sorry, I can't write the test.

[Marco Trevisan (Treviño) (3v1n0)]

Mh, ok... I can do it, but could you please at least fix the memory leak?

[lp:~ballogy/bamf/fix-current-desktop]

504. By Balló György on 2013-02-16

Fix memory leak

[Balló György (ballogy)]

Yes, now I fixed the memory leak.

[Marco Trevisan (Treviño) (3v1n0)]

Ok, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-01-29 19:06:11 +0000
+++ src/bamf-matcher.c	2013-02-16 22:23:19 +0000
@@ -821,6 +821,7 @@
                             GHashTable *desktop_class_table)
 {
   GDesktopAppInfo *desktop_file;
+  const char *current_desktop;
   char *exec;
   char *path;
   GString *desktop_id; /* is ok... really */
@@ -834,7 +835,9 @@
       return;
     }
 
-  if (!g_desktop_app_info_get_show_in (desktop_file, g_getenv ("XDG_CURRENT_DESKTOP")))
+  current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+
+  if (current_desktop && !g_desktop_app_info_get_show_in (desktop_file, current_desktop))
     {
       g_object_unref (desktop_file);
       return;
@@ -842,9 +845,15 @@
 
   exec = g_strdup (g_app_info_get_commandline (G_APP_INFO (desktop_file)));
 
-  if (!exec)
+  if (!exec || exec[0] == '\0')
     {
       g_object_unref (desktop_file);
+
+      if (exec)
+        {
+          g_free (exec);
+        }
+
       return;
     }