Merge lp:~osomon/unity/4.0-dash-custom-home-screen into lp:unity/4.0

[Olivier Tilloy]

Do not rely solely on the executable name to launch an application, this doesn’t work for applications that are launched with parameters.

Use g_app_info_launch(…) instead.

[Gord Allott (gordallott)]

On Tue 10 Jan 2012 08:52:40 GMT, Olivier Tilloy wrote:
> Olivier Tilloy has proposed merging lp:~osomon/unity/4.0-dash-custom-home-screen into lp:unity/4.0.
>
> Requested reviews:
> Unity Team (unity-team)
> Related bugs:
> Bug #913885 in unity (Ubuntu): "Custom dash shortcut to desktop file drops Exec args"
> https://bugs.launchpad.net/ubuntu/+source/unity/+bug/913885
>
> For more details, see:
> https://code.launchpad.net/~osomon/unity/4.0-dash-custom-home-screen/+merge/88017

Looks good to me, desktop files are great ;) approving

 review approve
 status approved

--
Gordon Allott
Canonical Ltd.
27 Floor, Millbank Tower
London SW1P 4QP
www.canonical.com

review: Approve

Unmerged revisions

1723. By Olivier Tilloy on 2012-01-10

Do not rely solely on the executable name to launch an application, this doesn’t work for applications that are launched with parameters.

Use g_app_info_launch(…) instead.

=== modified file 'plugins/unityshell/src/PlacesHomeView.cpp'
--- plugins/unityshell/src/PlacesHomeView.cpp	2011-12-15 12:15:00 +0000
+++ plugins/unityshell/src/PlacesHomeView.cpp	2012-01-10 08:51:27 +0000
@@ -75,7 +75,8 @@
       _id(0),
       _place_id(NULL),
       _place_section(0),
-      _exec(NULL)
+      _exec(NULL),
+      _desktop_filename(NULL)
   {
     SetDndEnabled(false, false);
   }
@@ -84,12 +85,14 @@
   {
     g_free(_place_id);
     g_free(_exec);
+    g_free(_desktop_filename);
   }
 
   int      _id;
   gchar*   _place_id;
   guint32  _place_section;
   char*    _exec;
+  char*    _desktop_filename;
 };
 
 PlacesHomeView::PlacesHomeView()
@@ -344,11 +347,10 @@
               icon = cicon;
               g_free(cicon);
             }
-            gchar* exec = g_strdup(g_app_info_get_executable(G_APP_INFO(info)));
             markup = g_strdup_printf(temp, name.c_str());
             shortcut = new Shortcut(icon.c_str(), markup, style->GetHomeTileIconSize());
             shortcut->_id = TYPE_EXEC;
-            shortcut->_exec = exec;
+            shortcut->_desktop_filename = g_strdup(g_desktop_app_info_get_filename(info));
             _layout->AddView(shortcut, 1, nux::eLeft, nux::eFull);
             shortcut->sigClick.connect(sigc::mem_fun(this, &PlacesHomeView::OnShortcutClicked));
             g_free(markup);
@@ -526,7 +528,29 @@
   {
     GError* error = NULL;
 
-    if (!g_spawn_command_line_async(shortcut->_exec, &error))
+    if (shortcut->_desktop_filename != NULL)
+    {
+      GDesktopAppInfo* info = g_desktop_app_info_new_from_filename(shortcut->_desktop_filename);
+      if (G_IS_DESKTOP_APP_INFO(info))
+      {
+        if (!g_app_info_launch(G_APP_INFO(info), NULL, NULL, &error))
+        {
+          g_warning("%s: Unable to launch %s: %s",
+                    G_STRFUNC,
+                    shortcut->_desktop_filename,
+                    error->message);
+          g_error_free(error);
+        }
+        g_object_unref(info);
+      }
+      else
+      {
+        g_warning("%s: Unable to build desktop file info from %s",
+                  G_STRFUNC,
+                  shortcut->_desktop_filename);
+      }
+    }
+    else if (!g_spawn_command_line_async(shortcut->_exec, &error))
     {
       g_warning("%s: Unable to launch %s: %s",
                 G_STRFUNC,