Merge lp:~kamstrup/unity/localapps into lp:unity

[Mikkel Kamstrup Erlandsen]

See commit msg

[Mirco Müller (macslow)]

Uff... that was taking quite some time to test. But approved now.

review: Approve

=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-03-10 15:21:45 +0000
+++ src/PlacesView.cpp	2011-03-14 14:27:17 +0000
@@ -487,6 +487,7 @@
 PlacesView::OnResultActivated (GVariant *data, PlacesView *self)
 {
   const char *uri;
+  int         i;
 
   uri = g_variant_get_string (data, NULL);
 
@@ -498,22 +499,50 @@
 
   if (g_str_has_prefix (uri, "application://"))
   {
-    const char      *id = &uri[14];
+    char            *id = g_strdup (&uri[14]);
     GDesktopAppInfo *info;
 
-    info = g_desktop_app_info_new (id);
-    if (G_IS_DESKTOP_APP_INFO (info))
+    /* The docs for g_desktop_app_info_new() says it respects "-" to "/"
+     * substitution as per XDG Menu Spec, but it only seems to work for
+     * exactly 1 substitution where as Wine programs often require many.
+     * Bottom line: We must do some manual trial and error to find desktop
+     * files in deeply nested directories */
+    while (id != NULL)
     {
-      GError *error = NULL;
-
-      g_app_info_launch (G_APP_INFO (info), NULL, NULL, &error);
-      if (error)
+      info = g_desktop_app_info_new (id);
+      if (info != NULL)
       {
-        g_warning ("Unable to launch %s: %s", id,  error->message);
-        g_error_free (error);
+        GError *error = NULL;
+
+        g_app_info_launch (G_APP_INFO (info), NULL, NULL, &error);
+        if (error)
+        {
+          g_warning ("Unable to launch %s: %s", id,  error->message);
+          g_error_free (error);
+        }
+        g_object_unref (info);
+        break;
       }
-      g_object_unref (info);
+     
+     /* Try to replace the next - with a / and do the lookup again.
+      * If we set id=NULL we'll exit the outer loop */
+     for (i = 0; ; i++)
+     {
+       if (id[i] == '-')
+       {
+         id[i] = '/';
+         break;
+       }
+       else if (id[i] == '\0')
+       {
+         g_free (id);
+         id = NULL;
+         break;
+       }
+     }
    }
+   
+   g_free (id);
   }
   else
   {