Merge lp:~3v1n0/bamf/create-local-desktop into lp:bamf

[Marco Trevisan (Treviño)]

BamfControl: add an API to allow generation of local .desktop file for a BamfApplication.

Add a bamf_control dbus method that requests to generate a new local .desktop
file for the provided application path. In case the application has alredy
a desktop file, the request is ignored. Otherwise we use some euristic to
generate an hopefully valid file saved in $XDG_DATA_HOME dir.

Also added a new DesktopUpdated signal to the BamfApplication DBus interface
that is emitted when the .desktop file for an application is set (for now).

Add a bamf_control dbus method that requests to generate a new local .desktop
file for the provided application path. In case the application has alredy
a desktop file, the request is ignored. Otherwise we use some euristic to
generate an hopefully valid file saved in $XDG_DATA_HOME dir.

Also added a new DesktopUpdated signal to the BamfApplication DBus interface
that is emitted when the .desktop file for an application is set (for now).

All the dbus changes have been reflected to the libbamf API.
New unit tests added.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:644
http://jenkins.qa.ubuntu.com/job/bamf-ci/79/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/61/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/79/rebuild

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/bamf/create-local-desktop]

645. By Marco Trevisan (Treviño) on 2013-08-06

debian: update libbamf3-1 symbols file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:645
http://jenkins.qa.ubuntu.com/job/bamf-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/63

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/81/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Merges and builds cleanly and all tests new and old pass. Code looks good.

I did not try the actual creating the desktop file since that is done by https://code.launchpad.net/~3v1n0/unity/desktop-file-updated-support/+merge/178703. I will review that MP and see if the .desktop file gets created and that the actual bug is fixed.

review: Approve

=== modified file 'debian/libbamf3-1.symbols'
--- debian/libbamf3-1.symbols	2012-12-19 16:21:01 +0000
+++ debian/libbamf3-1.symbols	2013-08-06 16:20:35 +0000
@@ -10,6 +10,7 @@
  bamf_application_get_xids@Base 0.2.20
  bamf_application_new@Base 0.2.20
  bamf_application_new_favorite@Base 0.2.60
+ bamf_control_create_local_desktop_file@Base 0.5.0
  bamf_control_get_default@Base 0.2.20
  bamf_control_get_type@Base 0.2.20
  bamf_control_insert_desktop_file@Base 0.2.20

=== modified file 'lib/libbamf-private/org.ayatana.bamf.view.xml'
--- lib/libbamf-private/org.ayatana.bamf.view.xml	2013-06-19 19:31:58 +0000
+++ lib/libbamf-private/org.ayatana.bamf.view.xml	2013-08-06 16:20:35 +0000
@@ -105,6 +105,9 @@
     <signal name="SupportedMimeTypesChanged">
       <arg name="dnd_mimes" type="as"/>
     </signal>
+    <signal name="DesktopFileUpdated">
+      <arg name="desktop_file" type="s"/>
+    </signal>
   </interface>
 
   <interface name="org.ayatana.bamf.window">

=== modified file 'lib/libbamf-private/org.ayatana.bamf.xml'
--- lib/libbamf-private/org.ayatana.bamf.xml	2013-06-08 13:54:06 +0000
+++ lib/libbamf-private/org.ayatana.bamf.xml	2013-08-06 16:20:35 +0000
@@ -4,7 +4,7 @@
   <interface name="org.ayatana.bamf.control">
     <method name="Quit">
     </method>
-    <method name="OmNomNomDesktopFile">
+    <method name="InsertDesktopFile">
       <arg name="tab_path" type="s" direction="in"/>
     </method>
     <method name="RegisterTabProvider">
@@ -14,6 +14,13 @@
       <arg name="application" type="s" direction="in"/>
       <arg name="pid" type="i" direction="in"/>
     </method>
+    <method name="CreateLocalDesktopFile">
+      <arg name="application" type="s" direction="in"/>
+    </method>
+    <method name="OmNomNomDesktopFile">
+      <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
+      <arg name="tab_path" type="s" direction="in"/>
+    </method>
   </interface>
 
   <interface name="org.ayatana.bamf.matcher">

=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2013-07-20 14:57:45 +0000
+++ lib/libbamf/bamf-application.c	2013-08-06 16:20:35 +0000
@@ -52,6 +52,7 @@
 
 enum
 {
+  DESKTOP_FILE_UPDATED,
   WINDOW_ADDED,
   WINDOW_REMOVED,
 
@@ -408,6 +409,15 @@
 }
 
 static void
+bamf_application_on_desktop_file_updated (BamfDBusItemApplication *proxy, const char *desktop_file, BamfApplication *self)
+{
+  g_free (self->priv->desktop_file);
+  self->priv->desktop_file = g_strdup (desktop_file);
+
+  g_signal_emit (self, application_signals[DESKTOP_FILE_UPDATED], 0, desktop_file);
+}
+
+static void
 bamf_application_on_window_added (BamfDBusItemApplication *proxy, const char *path, BamfApplication *self)
 {
   BamfView *view;
@@ -549,6 +559,9 @@
 
   g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (priv->proxy), BAMF_DBUS_DEFAULT_TIMEOUT);
 
+  g_signal_connect (priv->proxy, "desktop-file-updated",
+                    G_CALLBACK (bamf_application_on_desktop_file_updated), view);
+
   g_signal_connect (priv->proxy, "window-added",
                     G_CALLBACK (bamf_application_on_window_added), view);
 
@@ -678,6 +691,14 @@
 
   g_type_class_add_private (obj_class, sizeof (BamfApplicationPrivate));
 
+  application_signals [DESKTOP_FILE_UPDATED] =
+    g_signal_new (BAMF_APPLICATION_SIGNAL_DESKTOP_FILE_UPDATED,
+                  G_OBJECT_CLASS_TYPE (klass),
+                  0,
+                  0, NULL, NULL, NULL,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
+
   application_signals [WINDOW_ADDED] =
     g_signal_new (BAMF_APPLICATION_SIGNAL_WINDOW_ADDED,
                   G_OBJECT_CLASS_TYPE (klass),

=== modified file 'lib/libbamf/bamf-application.h'
--- lib/libbamf/bamf-application.h	2013-06-18 14:46:15 +0000
+++ lib/libbamf/bamf-application.h	2013-08-06 16:20:35 +0000
@@ -50,8 +50,9 @@
 #define BAMF_APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),\
         BAMF_TYPE_APPLICATION, BamfApplicationClass))
 
-#define BAMF_APPLICATION_SIGNAL_WINDOW_ADDED   "window-added"
-#define BAMF_APPLICATION_SIGNAL_WINDOW_REMOVED "window-removed"
+#define BAMF_APPLICATION_SIGNAL_DESKTOP_FILE_UPDATED "desktop-file-updated"
+#define BAMF_APPLICATION_SIGNAL_WINDOW_ADDED         "window-added"
+#define BAMF_APPLICATION_SIGNAL_WINDOW_REMOVED       "window-removed"
 
 typedef struct _BamfApplication        BamfApplication;
 typedef struct _BamfApplicationClass   BamfApplicationClass;

=== modified file 'lib/libbamf/bamf-control.c'
--- lib/libbamf/bamf-control.c	2013-06-08 13:54:06 +0000
+++ lib/libbamf/bamf-control.c	2013-08-06 16:20:35 +0000
@@ -37,6 +37,7 @@
 
 #include <libbamf-private/bamf-private.h>
 #include "bamf-control.h"
+#include "bamf-view-private.h"
 
 G_DEFINE_TYPE (BamfControl, bamf_control, G_TYPE_OBJECT);
 
@@ -117,7 +118,7 @@
 /**
  * bamf_control_get_default:
  *
- * Returns: (transfer none): The default #BamfControl reference.
+ * Returns: (transfer full): The default #BamfControl reference.
  */
 BamfControl *
 bamf_control_get_default (void)
@@ -125,7 +126,9 @@
   if (BAMF_IS_CONTROL (default_control))
     return g_object_ref (default_control);
 
-  return (default_control = g_object_new (BAMF_TYPE_CONTROL, NULL));
+  default_control = g_object_new (BAMF_TYPE_CONTROL, NULL);
+
+  return default_control;
 }
 
 void
@@ -137,9 +140,8 @@
   g_return_if_fail (BAMF_IS_CONTROL (control));
   priv = control->priv;
 
-  if (!_bamf_dbus_control_call_om_nom_nom_desktop_file_sync (priv->proxy,
-                                                             desktop_file,
-                                                             NULL, &error))
+  if (!_bamf_dbus_control_call_insert_desktop_file_sync (priv->proxy, desktop_file,
+                                                         NULL, &error))
     {
       g_warning ("Failed to insert desktop file: %s", error->message);
       g_error_free (error);
@@ -147,6 +149,30 @@
 }
 
 void
+bamf_control_create_local_desktop_file (BamfControl *control, BamfApplication *app)
+{
+  BamfControlPrivate *priv;
+  const gchar *app_path;
+  GError *error = NULL;
+
+  g_return_if_fail (BAMF_IS_CONTROL (control));
+  g_return_if_fail (BAMF_IS_APPLICATION (app));
+
+  priv = control->priv;
+  app_path = _bamf_view_get_path (BAMF_VIEW (app));
+
+  if (!app_path)
+    return;
+
+  if (!_bamf_dbus_control_call_create_local_desktop_file_sync (priv->proxy, app_path,
+                                                               NULL, &error))
+    {
+      g_warning ("Failed to create local desktop file: %s", error->message);
+      g_error_free (error);
+    }
+}
+
+void
 bamf_control_register_application_for_pid (BamfControl  *control,
                                            const gchar  *desktop_file,
                                            gint32        pid)

=== modified file 'lib/libbamf/bamf-control.h'
--- lib/libbamf/bamf-control.h	2013-06-08 13:54:06 +0000
+++ lib/libbamf/bamf-control.h	2013-08-06 16:20:35 +0000
@@ -29,6 +29,7 @@
 #define _BAMF_CONTROL_H_
 
 #include <glib-object.h>
+#include "bamf-application.h"
 
 G_BEGIN_DECLS
 
@@ -80,6 +81,9 @@
 void          bamf_control_insert_desktop_file          (BamfControl *control,
                                                          const gchar *desktop_file);
 
+void          bamf_control_create_local_desktop_file    (BamfControl *control,
+                                                         BamfApplication *application);
+
 void          bamf_control_register_application_for_pid (BamfControl *control,
                                                          const gchar *desktop_file,
                                                          gint32       pid);

=== modified file 'lib/libbamf/bamf-tab-source.c'
--- lib/libbamf/bamf-tab-source.c	2013-06-13 22:20:25 +0000
+++ lib/libbamf/bamf-tab-source.c	2013-08-06 16:20:35 +0000
@@ -138,8 +138,8 @@
                          gchar *tab_id,
                          BamfTabSource *self)
 {
+  g_dbus_method_invocation_return_value (invocation, NULL);
   bamf_tab_source_show_tab (self, tab_id, NULL);
-  g_dbus_method_invocation_return_value (invocation, NULL);
 
   return TRUE;
 }

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2013-07-23 22:40:05 +0000
+++ src/bamf-application.c	2013-08-06 16:20:35 +0000
@@ -40,6 +40,7 @@
   BamfDBusItemApplication *dbus_iface;
   BamfApplicationType app_type;
   BamfView * main_child;
+  GCancellable * cancellable;
   char * desktop_file;
   GList * desktop_file_list;
   char * wmclass;
@@ -104,7 +105,7 @@
 
   GKeyFile* key_file = g_key_file_new ();
 
-  if (!g_key_file_load_from_file (key_file, desktop_file, (GKeyFileFlags) 0, NULL))
+  if (!g_key_file_load_from_file (key_file, desktop_file, G_KEY_FILE_NONE, NULL))
     {
       g_key_file_free (key_file);
       return NULL;
@@ -340,7 +341,7 @@
 
       if (!icon)
         {
-          icon = g_strdup (bamf_legacy_window_save_mini_icon (legacy_window));
+          icon = bamf_legacy_window_save_mini_icon (legacy_window);
 
           if (!icon)
             {
@@ -388,6 +389,9 @@
                                             on_main_child_name_changed, application);
     }
 
+  g_signal_emit_by_name (application, "desktop-file-updated",
+                         application->priv->desktop_file);
+
   bamf_application_setup_icon_and_name (application, TRUE);
 }
 
@@ -414,6 +418,255 @@
   return TRUE;
 }
 
+static GFile *
+try_create_subdir (GFile *parent, const gchar *child_name, GCancellable *cancellable)
+{
+  GFile *child;
+  GError *error = NULL;
+
+  child = g_file_get_child (parent, child_name);
+  g_return_val_if_fail (G_IS_FILE (child), NULL);
+
+  g_file_make_directory_with_parents (child, cancellable, &error);
+
+  if (error)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+        {
+          g_error ("Impossible to create `%s` directory: %s", child_name, error->message);
+          g_clear_object (&child);
+        }
+
+      g_error_free (error);
+    }
+
+  return child;
+}
+
+static GFile *
+try_create_child (GFile *parent, const gchar *basename, const gchar *extension, GCancellable *cancellable)
+{
+  gchar *down, *child_name;
+
+  down = g_ascii_strdown (basename, -1);
+  g_strdelimit (down, "/\\&%\"'!?`*.;:^|()= <>[]{}", '_');
+
+  child_name = g_strconcat (down, extension, NULL);
+
+  GFile *child = g_file_get_child (parent, child_name);
+  g_return_val_if_fail (G_IS_FILE (child), NULL);
+
+  if (g_file_query_exists (child, cancellable))
+    g_clear_object (&child);
+
+  g_free (child_name);
+  g_free (down);
+
+  return child;
+}
+
+gboolean
+try_create_local_desktop_data (GFile *apps_dir, GFile *icons_dir, const char *basename,
+                               GFile **out_desktop_file, GFile **out_icon_file,
+                               GCancellable *cancellable)
+{
+  g_return_val_if_fail (out_desktop_file, NULL);
+
+  if (!apps_dir)
+    {
+      *out_desktop_file = NULL;
+      g_warn_if_reached ();
+    }
+
+  *out_desktop_file = try_create_child (apps_dir, basename, ".desktop", cancellable);
+
+  if (G_IS_FILE (*out_desktop_file))
+    {
+      if (G_IS_FILE (icons_dir) && out_icon_file)
+        *out_icon_file = try_create_child (icons_dir, basename, ".png", cancellable);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+bamf_application_create_local_desktop_file (BamfApplication *self)
+{
+  BamfApplicationPrivate *priv;
+  BamfLegacyWindow *window;
+  GKeyFile *key_file;
+  const gchar *name, *icon, *iclass, *nclass, *class, *exec;
+  GFile *data_dir, *apps_dir, *icons_dir, *desktop_file, *icon_file, *mini_icon;
+  GError *error = NULL;
+
+  g_return_val_if_fail (BAMF_IS_APPLICATION (self), FALSE);
+  priv = self->priv;
+
+  if (priv->desktop_file || !BAMF_IS_WINDOW (priv->main_child))
+    {
+      return FALSE;
+    }
+
+  window = bamf_window_get_window (BAMF_WINDOW (priv->main_child));
+  exec = bamf_legacy_window_get_exec_string (window);
+
+  if (!exec)
+    {
+      return FALSE;
+    }
+
+  data_dir = g_file_new_for_path (g_get_user_data_dir ());
+  name = bamf_view_get_name (BAMF_VIEW (self));
+  icon = bamf_view_get_icon (BAMF_VIEW (self));
+  iclass = bamf_legacy_window_get_class_instance_name (window);
+  nclass = bamf_legacy_window_get_class_name (window);
+  mini_icon = bamf_legacy_window_get_saved_mini_icon (window);
+
+  apps_dir = try_create_subdir (data_dir, "applications", priv->cancellable);
+  icons_dir = NULL;
+
+  if (!G_IS_FILE (apps_dir))
+    {
+      g_object_unref (data_dir);
+      return FALSE;
+    }
+
+  if (icon && G_IS_FILE (mini_icon))
+    icons_dir = try_create_subdir (data_dir, "icons", priv->cancellable);
+
+  g_clear_object (&data_dir);
+
+  desktop_file = NULL;
+  icon_file = NULL;
+  class = (iclass) ? iclass : nclass;
+
+  if (class)
+    {
+      try_create_local_desktop_data (apps_dir, icons_dir, class,
+                                     &desktop_file, &icon_file, priv->cancellable);
+    }
+
+  if (!G_IS_FILE (desktop_file))
+    {
+      BamfMatcher *matcher = bamf_matcher_get_default ();
+      gchar *trimmed_exec = bamf_matcher_get_trimmed_exec (matcher, exec);
+      try_create_local_desktop_data (apps_dir, icons_dir, trimmed_exec,
+                                     &desktop_file, &icon_file, priv->cancellable);
+      g_free (trimmed_exec);
+    }
+
+  if (!G_IS_FILE (desktop_file))
+    {
+      try_create_local_desktop_data (apps_dir, icons_dir, exec,
+                                     &desktop_file, &icon_file, priv->cancellable);
+    }
+
+  g_object_unref (apps_dir);
+
+  if (!G_IS_FILE (desktop_file))
+    {
+      g_critical ("Impossible to find a valid path where to save a .desktop file");
+      g_clear_object (&icons_dir);
+      g_clear_object (&icon_file);
+      return FALSE;
+    }
+
+  if (G_IS_FILE (icons_dir) && !G_IS_FILE (icon_file))
+    {
+      gchar *basename = g_file_get_basename (mini_icon);
+      icon_file = try_create_child (icons_dir, basename+1, ".png", priv->cancellable);
+      g_free (basename);
+    }
+
+  g_clear_object (&icons_dir);
+
+  if (G_IS_FILE (icon_file))
+    {
+      if (!g_file_copy (mini_icon, icon_file, G_FILE_COPY_NONE,
+                        priv->cancellable, NULL, NULL, &error))
+        {
+          g_warning ("Impossible to copy icon to final destination: %s", error->message);
+          g_clear_error (&error);
+          g_clear_object (&icon_file);
+        }
+    }
+
+  key_file = g_key_file_new ();
+  g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                         G_KEY_FILE_DESKTOP_KEY_TYPE,
+                         G_KEY_FILE_DESKTOP_TYPE_APPLICATION);
+
+  if (name)
+    {
+      g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                             G_KEY_FILE_DESKTOP_KEY_NAME, name);
+    }
+
+  if (icon_file)
+    {
+      gchar *basename = g_file_get_basename (icon_file);
+      g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                             G_KEY_FILE_DESKTOP_KEY_ICON, basename);
+      bamf_view_set_icon (BAMF_VIEW (self), basename);
+      g_free (basename);
+      g_clear_object (&icon_file);
+    }
+  else if (icon)
+    {
+      g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                             G_KEY_FILE_DESKTOP_KEY_ICON, icon);
+    }
+
+  g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                         G_KEY_FILE_DESKTOP_KEY_EXEC, exec);
+
+  g_key_file_set_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                          G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, TRUE);
+
+  if (class)
+    {
+      g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                             G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS, class);
+    }
+
+  gsize data_length = 0;
+  gchar *data = g_key_file_to_data (key_file, &data_length, &error);
+  g_key_file_free (key_file);
+
+  if (error)
+    {
+      g_critical ("Impossible to generate local desktop file: %s", error->message);
+      g_clear_error (&error);
+      g_clear_pointer (&data, g_free);
+    }
+
+  if (data)
+    {
+      g_file_replace_contents (desktop_file, data, data_length, NULL, FALSE,
+                               G_FILE_CREATE_NONE, NULL, priv->cancellable, &error);
+      g_free (data);
+
+      if (error)
+        {
+          g_critical ("Impossible to create local desktop file: %s", error->message);
+          g_clear_error (&error);
+          g_object_unref (desktop_file);
+
+          return FALSE;
+        }
+    }
+
+  gchar *desktop_path = g_file_get_path (desktop_file);
+  g_object_unref (desktop_file);
+
+  bamf_application_set_desktop_file (self, desktop_path);
+  g_free (desktop_path);
+
+  return TRUE;
+}
+
 void
 bamf_application_set_wmclass (BamfApplication *application,
                               const char *wmclass)
@@ -888,6 +1141,13 @@
   g_signal_emit_by_name (self->priv->dbus_iface, "window-removed", win_path);
 }
 
+static void
+on_desktop_file_updated (BamfApplication *self, const gchar *file, gpointer _not_used)
+{
+  g_return_if_fail (BAMF_IS_APPLICATION (self));
+  g_signal_emit_by_name (self->priv->dbus_iface, "desktop-file-updated", file);
+}
+
 static gboolean
 on_dbus_handle_show_stubs (BamfDBusItemApplication *interface,
                            GDBusMethodInvocation *invocation,
@@ -1056,6 +1316,13 @@
       priv->main_child = NULL;
     }
 
+  if (priv->cancellable)
+    {
+      g_cancellable_cancel (priv->cancellable);
+      g_object_unref (priv->cancellable);
+      priv->cancellable = NULL;
+    }
+
   g_strfreev (priv->mimes);
   priv->mimes = NULL;
 
@@ -1085,6 +1352,8 @@
   priv->app_type = BAMF_APPLICATION_SYSTEM;
   priv->show_stubs = TRUE;
 
+  priv->cancellable = g_cancellable_new ();
+
   /* Initializing the dbus interface */
   priv->dbus_iface = _bamf_dbus_item_application_skeleton_new ();
 
@@ -1092,6 +1361,7 @@
    * interface                                                                */
   g_signal_connect (self, "window-added", G_CALLBACK (on_window_added), NULL);
   g_signal_connect (self, "window-removed", G_CALLBACK (on_window_removed), NULL);
+  g_signal_connect (self, "desktop-file-updated", G_CALLBACK (on_desktop_file_updated), NULL);
 
   /* Registering signal callbacks to reply to dbus method calls */
   g_signal_connect (priv->dbus_iface, "handle-show-stubs",

=== modified file 'src/bamf-application.h'
--- src/bamf-application.h	2013-07-16 16:17:38 +0000
+++ src/bamf-application.h	2013-08-06 16:20:35 +0000
@@ -84,6 +84,8 @@
 gboolean          bamf_application_contains_similar_to_window (BamfApplication *app,
                                                                BamfWindow *window);
 
+gboolean          bamf_application_create_local_desktop_file  (BamfApplication *app);
+
 const char      * bamf_application_get_wmclass                (BamfApplication *application);
 void              bamf_application_set_wmclass                (BamfApplication *application,
                                                                const char *wmclass);

=== modified file 'src/bamf-control.c'
--- src/bamf-control.c	2013-06-08 13:54:06 +0000
+++ src/bamf-control.c	2013-08-06 16:20:35 +0000
@@ -19,9 +19,12 @@
  */
 
 
-#include "bamf-matcher.h"
+#include <libbamf-private/bamf-private.h>
+
 #include "bamf-control.h"
+#include "bamf-application.h"
 #include "bamf-daemon.h"
+#include "bamf-matcher.h"
 
 G_DEFINE_TYPE (BamfControl, bamf_control, BAMF_DBUS_TYPE_CONTROL_SKELETON);
 #define BAMF_CONTROL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
@@ -96,20 +99,20 @@
                      GDBusMethodInvocation *invocation,
                      BamfControl *self)
 {
+  g_dbus_method_invocation_return_value (invocation, NULL);
   bamf_control_quit (self);
-  g_dbus_method_invocation_return_value (invocation, NULL);
 
   return TRUE;
 }
 
 static gboolean
-on_dbus_handle_om_nom_nom_desktop_file (BamfDBusControl *interface,
-                                        GDBusMethodInvocation *invocation,
-                                        const gchar *desktop_file,
-                                        BamfControl *self)
+on_dbus_handle_insert_desktop_file (BamfDBusControl *interface,
+                                    GDBusMethodInvocation *invocation,
+                                    const gchar *desktop_file,
+                                    BamfControl *self)
 {
+  g_dbus_method_invocation_return_value (invocation, NULL);
   bamf_control_insert_desktop_file (self, desktop_file);
-  g_dbus_method_invocation_return_value (invocation, NULL);
 
   return TRUE;
 }
@@ -121,8 +124,20 @@
                                              guint pid,
                                              BamfControl *self)
 {
+  g_dbus_method_invocation_return_value (invocation, NULL);
   bamf_control_register_application_for_pid (self, application, pid);
+
+  return TRUE;
+}
+
+static gboolean
+on_dbus_handle_create_local_desktop_file (BamfDBusControl *interface,
+                                          GDBusMethodInvocation *invocation,
+                                          const gchar *desktop_file,
+                                          BamfControl *self)
+{
   g_dbus_method_invocation_return_value (invocation, NULL);
+  bamf_control_create_local_desktop_file (self, desktop_file);
 
   return TRUE;
 }
@@ -138,10 +153,16 @@
                     G_CALLBACK (on_dbus_handle_quit), self);
 
   g_signal_connect (self, "handle-om-nom-nom-desktop-file",
-                    G_CALLBACK (on_dbus_handle_om_nom_nom_desktop_file), self);
+                    G_CALLBACK (on_dbus_handle_insert_desktop_file), self);
+
+  g_signal_connect (self, "handle-insert-desktop-file",
+                    G_CALLBACK (on_dbus_handle_insert_desktop_file), self);
 
   g_signal_connect (self, "handle-register-application-for-pid",
                     G_CALLBACK (on_dbus_handle_register_application_for_pid), self);
+
+  g_signal_connect (self, "handle-create-local-desktop-file",
+                    G_CALLBACK (on_dbus_handle_create_local_desktop_file), self);
 }
 
 static void
@@ -191,6 +212,22 @@
   bamf_matcher_load_desktop_file (matcher, path);
 }
 
+void
+bamf_control_create_local_desktop_file (BamfControl *control, const char *app_path)
+{
+  BamfMatcher *matcher;
+  BamfView *view;
+
+  g_return_if_fail (BAMF_IS_CONTROL (control));
+  g_return_if_fail (app_path);
+
+  matcher = bamf_matcher_get_default ();
+  view = bamf_matcher_get_view_by_path (matcher, app_path);
+
+  if (BAMF_IS_APPLICATION (view))
+    bamf_application_create_local_desktop_file (BAMF_APPLICATION (view));
+}
+
 static gboolean
 bamf_control_on_quit (BamfControl *control)
 {

=== modified file 'src/bamf-control.h'
--- src/bamf-control.h	2013-06-08 13:54:06 +0000
+++ src/bamf-control.h	2013-08-06 16:20:35 +0000
@@ -63,6 +63,9 @@
 void          bamf_control_insert_desktop_file          (BamfControl *control,
                                                          const char *path);
 
+void          bamf_control_create_local_desktop_file 	(BamfControl *control,
+                                                       const char *desktop_file);
+
 void          bamf_control_quit                         (BamfControl *control);
 
 BamfControl * bamf_control_get_default                  (void);

=== modified file 'src/bamf-legacy-window-test.c'
--- src/bamf-legacy-window-test.c	2013-07-23 22:40:05 +0000
+++ src/bamf-legacy-window-test.c	2013-08-06 16:20:35 +0000
@@ -420,10 +420,10 @@
   return g_hash_table_insert (self->hints, g_strdup (name), g_strdup (value));
 }
 
-static const char *
+static char *
 bamf_legacy_window_test_save_mini_icon (BamfLegacyWindow *window)
 {
-  return BAMF_LEGACY_WINDOW_TEST (window)->icon;
+  return g_strdup (BAMF_LEGACY_WINDOW_TEST (window)->icon);
 }
 
 static void

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2013-07-23 22:40:05 +0000
+++ src/bamf-legacy-window.c	2013-08-06 16:20:35 +0000
@@ -51,7 +51,7 @@
 struct _BamfLegacyWindowPrivate
 {
   WnckWindow * legacy_window;
-  gchar      * mini_icon_path;
+  GFile      * mini_icon;
   gchar      * exec_string;
   gboolean     is_closed;
 };
@@ -260,7 +260,7 @@
   return self->priv->exec_string;
 }
 
-const char *
+char *
 bamf_legacy_window_save_mini_icon (BamfLegacyWindow *self)
 {
   WnckWindow *window;
@@ -274,16 +274,16 @@
   if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->save_mini_icon)
     return BAMF_LEGACY_WINDOW_GET_CLASS (self)->save_mini_icon (self);
 
-  if (self->priv->mini_icon_path)
+  if (self->priv->mini_icon)
     {
-      if (g_file_test (self->priv->mini_icon_path, G_FILE_TEST_EXISTS))
+      if (g_file_query_exists (self->priv->mini_icon, NULL))
         {
-          return self->priv->mini_icon_path;
+          return g_file_get_path (self->priv->mini_icon);
         }
       else
         {
-          g_free (self->priv->mini_icon_path);
-          self->priv->mini_icon_path = NULL;
+          g_object_unref (self->priv->mini_icon);
+          self->priv->mini_icon = NULL;
         }
     }
 
@@ -305,13 +305,21 @@
 
   if (gdk_pixbuf_save_to_stream (pbuf, output, "png", NULL, NULL, NULL))
     {
-      self->priv->mini_icon_path = g_file_get_path (tmp);
+      self->priv->mini_icon = g_object_ref (tmp);
     }
 
   g_object_unref (iostream);
   g_object_unref (tmp);
 
-  return self->priv->mini_icon_path;
+  return g_file_get_path (self->priv->mini_icon);
+}
+
+GFile *
+bamf_legacy_window_get_saved_mini_icon (BamfLegacyWindow *self)
+{
+  g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
+
+  return self->priv->mini_icon;
 }
 
 guint
@@ -563,19 +571,14 @@
 bamf_legacy_window_dispose (GObject *object)
 {
   BamfLegacyWindow *self;
-  GFile *file;
   guint i;
 
   self = BAMF_LEGACY_WINDOW (object);
 
-  if (self->priv->mini_icon_path)
+  if (self->priv->mini_icon)
     {
-      file = g_file_new_for_path (self->priv->mini_icon_path);
-      g_file_delete (file, NULL, NULL);
-      g_object_unref (file);
-
-      g_free (self->priv->mini_icon_path);
-      self->priv->mini_icon_path = NULL;
+      g_file_delete (self->priv->mini_icon, NULL, NULL);
+      g_object_unref (self->priv->mini_icon);
     }
 
   if (self->priv->exec_string)

=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2013-07-23 22:40:05 +0000
+++ src/bamf-legacy-window.h	2013-08-06 16:20:35 +0000
@@ -76,8 +76,8 @@
   const char * (*get_role)                (BamfLegacyWindow *legacy_window);
   const char * (*get_class_name)          (BamfLegacyWindow *legacy_window);
   const char * (*get_class_instance_name) (BamfLegacyWindow *legacy_window);
-  const char * (*save_mini_icon)          (BamfLegacyWindow *legacy_window);
   const char * (*get_exec_string)         (BamfLegacyWindow *legacy_window);
+  char       * (*save_mini_icon)          (BamfLegacyWindow *legacy_window);
   char       * (*get_process_name)        (BamfLegacyWindow *legacy_window);
   char       * (*get_app_id)              (BamfLegacyWindow *legacy_window);
   char       * (*get_unique_bus_name)     (BamfLegacyWindow *legacy_window);
@@ -147,10 +147,12 @@
 
 const char       * bamf_legacy_window_get_role             (BamfLegacyWindow *self);
 
-const char       * bamf_legacy_window_save_mini_icon       (BamfLegacyWindow *self);
-
 const char       * bamf_legacy_window_get_exec_string      (BamfLegacyWindow *self);
 
+char             * bamf_legacy_window_save_mini_icon       (BamfLegacyWindow *self);
+
+GFile            * bamf_legacy_window_get_saved_mini_icon  (BamfLegacyWindow *self);
+
 char             * bamf_legacy_window_get_process_name     (BamfLegacyWindow *self);
 
 BamfLegacyWindow * bamf_legacy_window_get_transient        (BamfLegacyWindow *self);

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-07-24 00:11:01 +0000
+++ src/bamf-matcher.c	2013-08-06 16:20:35 +0000
@@ -191,6 +191,31 @@
   return NULL;
 }
 
+
+BamfView *
+bamf_matcher_get_view_by_path (BamfMatcher *self, const char *view_path)
+{
+  GList *l;
+  BamfView *view;
+
+  g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
+
+  for (l = self->priv->views; l; l = l->next)
+    {
+      view = l->data;
+
+      if (!BAMF_IS_VIEW (view))
+        continue;
+
+      if (g_strcmp0 (bamf_view_get_path (view), view_path) == 0)
+        {
+          return view;
+        }
+    }
+
+  return NULL;
+}
+
 static gboolean
 emit_paths_changed (gpointer user_data)
 {
@@ -2835,8 +2860,8 @@
                                    const char **favorites,
                                    BamfMatcher *self)
 {
+  g_dbus_method_invocation_return_value (invocation, NULL);
   bamf_matcher_register_favorites (self, favorites);
-  g_dbus_method_invocation_return_value (invocation, NULL);
 
   return TRUE;
 }
@@ -2917,7 +2942,7 @@
   webapp_tab = BAMF_UNITY_WEBAPPS_TAB (child);
   legacy_window = bamf_unity_webapps_tab_get_legacy_window_for (webapp_tab);
 
-  if (is_web_app_window (legacy_window))
+  if (legacy_window && is_web_app_window (legacy_window))
     {
       /* If we have a chromeless window, we remove the window from the
        * application children list, so that it won't be duplicated in launcher */

=== modified file 'src/bamf-matcher.h'
--- src/bamf-matcher.h	2013-06-26 20:34:40 +0000
+++ src/bamf-matcher.h	2013-08-06 16:20:35 +0000
@@ -114,6 +114,8 @@
 char        * bamf_matcher_get_trimmed_exec              (BamfMatcher *matcher,
                                                           const char *exec_string);
 
+BamfView    * bamf_matcher_get_view_by_path              (BamfMatcher *matcher,
+                                                          const char *view_path);
 
 BamfMatcher * bamf_matcher_get_default                   (void);
 

=== modified file 'src/bamf-tab.c'
--- src/bamf-tab.c	2013-06-13 17:08:07 +0000
+++ src/bamf-tab.c	2013-08-06 16:20:35 +0000
@@ -122,10 +122,9 @@
                       GDBusMethodInvocation *invocation,
                       BamfTab *self)
 {
+  g_dbus_method_invocation_return_value (invocation, NULL);
   bamf_tab_raise (self);
 
-  g_dbus_method_invocation_return_value (invocation, NULL);
-
   return TRUE;
 }
 
@@ -134,10 +133,9 @@
                       GDBusMethodInvocation *invocation,
                       BamfTab *self)
 {
+  g_dbus_method_invocation_return_value (invocation, NULL);
   bamf_tab_close (self);
 
-  g_dbus_method_invocation_return_value (invocation, NULL);
-
   return TRUE;
 }
 

=== modified file 'src/bamf-unity-webapps-application.c'
--- src/bamf-unity-webapps-application.c	2013-06-26 11:54:58 +0000
+++ src/bamf-unity-webapps-application.c	2013-08-06 16:20:35 +0000
@@ -229,7 +229,16 @@
 static gchar *
 bamf_unity_webapps_application_get_stable_bus_name (BamfView *view)
 {
-  return g_strdup_printf ("application%i", abs (g_str_hash (bamf_application_get_desktop_file (BAMF_APPLICATION (view)))));
+  const gchar *desktop_file;
+
+  desktop_file = bamf_application_get_desktop_file (BAMF_APPLICATION (view));
+
+  if (desktop_file)
+    {
+      return g_strdup_printf ("application%i", abs (g_str_hash (desktop_file)));
+    }
+
+  return g_strdup_printf ("application%p", view);
 }
 
 

=== modified file 'src/bamf-unity-webapps-observer.c'
--- src/bamf-unity-webapps-observer.c	2013-07-16 16:19:42 +0000
+++ src/bamf-unity-webapps-observer.c	2013-08-06 16:20:35 +0000
@@ -155,7 +155,6 @@
   unity_webapps_service_on_context_vanished (observer->priv->service, bamf_unity_webapps_observer_context_vanished, observer);
 
   bamf_unity_webapps_observer_register_existing_contexts (observer, observer->priv->service);
-
 }
 
 static void

=== modified file 'tests/bamfdaemon/test-application.c'
--- tests/bamfdaemon/test-application.c	2013-07-23 21:45:59 +0000
+++ tests/bamfdaemon/test-application.c	2013-08-06 16:20:35 +0000
@@ -328,7 +328,7 @@
   g_assert (g_file_test (test_icon, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR));
 
   key_file = g_key_file_new ();
-  g_key_file_load_from_file (key_file, test_app, (GKeyFileFlags)0, NULL);
+  g_key_file_load_from_file (key_file, test_app, G_KEY_FILE_NONE, NULL);
   g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, test_icon);
 
   gchar *key_data = g_key_file_to_data (key_file, NULL, NULL);
@@ -358,7 +358,7 @@
   g_assert (!g_file_test (invalid_test_icon, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR));
 
   key_file = g_key_file_new ();
-  g_key_file_load_from_file (key_file, test_app, (GKeyFileFlags)0, NULL);
+  g_key_file_load_from_file (key_file, test_app, G_KEY_FILE_NONE, NULL);
   g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, invalid_test_icon);
 
   gchar *key_data = g_key_file_to_data (key_file, NULL, NULL);
@@ -1099,6 +1099,218 @@
 }
 
 static void
+test_desktop_app_create_local_desktop_file (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new ();
+  bamf_application_set_desktop_file (application, DESKTOP_FILE);
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-class", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+
+  g_assert (!bamf_application_create_local_desktop_file (application));
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_desktopless_app_create_local_desktop_file_invalid_exec (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-class", NULL);
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+
+  g_assert (!bamf_application_create_local_desktop_file (application));
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+verify_application_desktop_file_content (BamfApplication *application)
+{
+  GKeyFile *key_file;
+  const gchar *desktop_file, *exec, *class;
+  gchar *str_value;
+  GError *error = NULL;
+  BamfView *main_child;
+  BamfLegacyWindow *main_window;
+
+  desktop_file = bamf_application_get_desktop_file (application);
+
+  key_file = g_key_file_new ();
+  g_key_file_load_from_file (key_file, desktop_file, G_KEY_FILE_NONE, NULL);
+
+  str_value = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                                     G_KEY_FILE_DESKTOP_KEY_TYPE, &error);
+  g_assert (!error);
+  g_assert_cmpstr (str_value, ==, G_KEY_FILE_DESKTOP_TYPE_APPLICATION);
+  g_clear_pointer (&str_value, g_free);
+
+  if (bamf_view_get_name (BAMF_VIEW (application)))
+    {
+      str_value = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                                         G_KEY_FILE_DESKTOP_KEY_NAME, &error);
+      g_assert (!error);
+      g_assert_cmpstr (str_value, ==, bamf_view_get_name (BAMF_VIEW (application)));
+      g_clear_pointer (&str_value, g_free);
+    }
+
+  if (bamf_view_get_icon (BAMF_VIEW (application)))
+    {
+      str_value = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                                         G_KEY_FILE_DESKTOP_KEY_ICON, &error);
+      g_assert (!error);
+      g_assert_cmpstr (str_value, ==, bamf_view_get_icon (BAMF_VIEW (application)));
+      g_clear_pointer (&str_value, g_free);
+    }
+
+  main_child = bamf_application_get_main_child (application);
+  main_window = bamf_window_get_window (BAMF_WINDOW (main_child));
+  exec = bamf_legacy_window_get_exec_string (main_window);
+
+  str_value = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                                     G_KEY_FILE_DESKTOP_KEY_EXEC, &error);
+  g_assert (!error);
+  g_assert_cmpstr (str_value, ==, exec);
+  g_clear_pointer (&str_value, g_free);
+
+  g_assert (g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                                    G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, &error));
+  g_assert (!error);
+
+  class = bamf_legacy_window_get_class_instance_name (main_window);
+  class = class ? class : bamf_legacy_window_get_class_name (main_window);
+
+  if (class)
+    {
+      str_value = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+                                         G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS, &error);
+      g_assert (!error);
+      g_assert_cmpstr (str_value, ==, class);
+      g_clear_pointer (&str_value, g_free);
+    }
+
+  g_key_file_free (key_file);
+}
+
+static void
+test_desktopless_app_create_local_desktop_file_using_instance_class_basename (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+  const gchar *desktop_path;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", NULL, "awesome --exec");
+  bamf_legacy_window_test_set_wmclass (lwin, "application-class", "instance-class");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+
+  g_assert (bamf_application_create_local_desktop_file (application));
+
+  desktop_path = bamf_application_get_desktop_file (application);
+  g_assert (desktop_path);
+  g_assert (g_str_has_suffix (desktop_path, "instance-class.desktop"));
+  g_assert (g_file_test (desktop_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR));
+  verify_application_desktop_file_content (application);
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_desktopless_app_create_local_desktop_file_using_name_class_basename (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+  const gchar *desktop_path;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "Application!/?Class", "awesome --exec");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+
+  g_assert (bamf_application_create_local_desktop_file (application));
+
+  desktop_path = bamf_application_get_desktop_file (application);
+  g_assert (desktop_path);
+  g_assert (g_str_has_suffix (desktop_path, "application___class.desktop"));
+  g_assert (g_file_test (desktop_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR));
+  verify_application_desktop_file_content (application);
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_desktopless_app_create_local_desktop_file_using_exec_basename (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+  const gchar *desktop_path;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", NULL, "awesome --exec");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+
+  g_assert (bamf_application_create_local_desktop_file (application));
+
+  desktop_path = bamf_application_get_desktop_file (application);
+  g_assert (desktop_path);
+  g_assert (g_str_has_suffix (desktop_path, "awesome.desktop"));
+  g_assert (g_file_test (desktop_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR));
+  verify_application_desktop_file_content (application);
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_desktopless_app_create_local_desktop_file_using_trimmed_exec_basename (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+  const gchar *desktop_path;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", NULL, "python awesome-script.py");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+
+  g_assert (bamf_application_create_local_desktop_file (application));
+
+  desktop_path = bamf_application_get_desktop_file (application);
+  g_assert (desktop_path);
+  g_assert (g_str_has_suffix (desktop_path, "awesome-script.desktop"));
+  g_assert (g_file_test (desktop_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR));
+  verify_application_desktop_file_content (application);
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
 test_contain_similar_to_window (void)
 {
   BamfApplication *application;
@@ -1202,6 +1414,7 @@
   g_test_add_func (DOMAIN"/DesktopFile/MainChild", test_desktop_app_main_child);
   g_test_add_func (DOMAIN"/DesktopFile/MainChild/NotMatchEmblems", test_desktop_app_main_child_doesnt_match_emblems);
   g_test_add_func (DOMAIN"/DesktopFile/MainChild/NotUpdatesEmblems", test_desktop_app_main_child_doesnt_update_emblems);
+  g_test_add_func (DOMAIN"/DesktopFile/CreateLocalDesktopFile", test_desktop_app_create_local_desktop_file);
   g_test_add_func (DOMAIN"/DesktopLess/Icon/ClassName", test_icon_class_name);
   g_test_add_func (DOMAIN"/DesktopLess/Icon/Exec", test_icon_exec_string);
   g_test_add_func (DOMAIN"/DesktopLess/Icon/Embedded", test_icon_embedded);
@@ -1215,6 +1428,11 @@
   g_test_add_func (DOMAIN"/DesktopLess/MainChild/NormalPriority", test_app_main_child_normal_priority);
   g_test_add_func (DOMAIN"/DesktopLess/MainChild/Removal", test_app_main_child_on_window_removal);
   g_test_add_func (DOMAIN"/DesktopLess/MainChild/ReplaceOnRemoval", test_app_main_child_on_window_replace_on_removal);
+  g_test_add_func (DOMAIN"/DesktopLess/CreateLocalDesktopFile/InvalidExec", test_desktopless_app_create_local_desktop_file_invalid_exec);
+  g_test_add_func (DOMAIN"/DesktopLess/CreateLocalDesktopFile/UsingClassInstance", test_desktopless_app_create_local_desktop_file_using_instance_class_basename);
+  g_test_add_func (DOMAIN"/DesktopLess/CreateLocalDesktopFile/UsingClassName", test_desktopless_app_create_local_desktop_file_using_name_class_basename);
+  g_test_add_func (DOMAIN"/DesktopLess/CreateLocalDesktopFile/UsingExec", test_desktopless_app_create_local_desktop_file_using_exec_basename);
+  g_test_add_func (DOMAIN"/DesktopLess/CreateLocalDesktopFile/UsingTrimmedExec", test_desktopless_app_create_local_desktop_file_using_trimmed_exec_basename);
   g_test_add_func (DOMAIN"/ManagesXid", test_manages_xid);
   g_test_add_func (DOMAIN"/GetWindow", test_get_window);
   g_test_add_func (DOMAIN"/Xids", test_get_xids);

=== modified file 'tests/bamfdaemon/test-bamf.c'
--- tests/bamfdaemon/test-bamf.c	2013-07-16 14:46:37 +0000
+++ tests/bamfdaemon/test-bamf.c	2013-08-06 16:20:35 +0000
@@ -82,6 +82,15 @@
 {
   GMainLoop *loop;
 
+  GFile *tmp_dir;
+  gchar *tmp_path;
+
+  tmp_path = g_dir_make_tmp (".bamfhomedataXXXXXX", NULL);
+  tmp_dir = g_file_new_for_path (tmp_path);
+  g_file_make_directory (tmp_dir, NULL, NULL);
+  g_setenv ("XDG_DATA_HOME", tmp_path, TRUE);
+  g_free (tmp_path);
+
   gtk_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
   glibtop_init ();
@@ -99,5 +108,8 @@
 
   g_main_loop_run (loop);
 
+  g_file_delete (tmp_dir, NULL, NULL);
+  g_object_unref (tmp_dir);
+
   return result;
 }

=== modified file 'tests/bamfdaemon/test-matcher.c'
--- tests/bamfdaemon/test-matcher.c	2013-07-24 00:11:46 +0000
+++ tests/bamfdaemon/test-matcher.c	2013-08-06 16:20:35 +0000
@@ -1176,6 +1176,42 @@
     }
 }
 
+static void
+test_get_view_by_path (void)
+{
+  BamfMatcher *matcher;
+  BamfLegacyScreen *screen;
+  BamfLegacyWindowTest *lwin;
+  BamfApplication *app;
+  BamfWindow *win;
+  GList *app_children;
+  guint32 xid;
+
+  screen = bamf_legacy_screen_get_default();
+  matcher = bamf_matcher_get_default ();
+
+  cleanup_matcher_tables (matcher);
+  export_matcher_on_bus (matcher);
+
+  xid = g_random_int ();
+  lwin = bamf_legacy_window_test_new (xid, "Window", NULL, NULL);
+  _bamf_legacy_screen_open_test_window (screen, lwin);
+
+  app = bamf_matcher_get_application_by_xid (matcher, xid);
+  const char *app_path = bamf_view_get_path (BAMF_VIEW (app));
+  g_assert (app == BAMF_APPLICATION (bamf_matcher_get_view_by_path (matcher, app_path)));
+
+  app_children = bamf_view_get_children (BAMF_VIEW (app));
+  g_assert (app_children);
+
+  win = BAMF_WINDOW (app_children->data);
+  const char *win_path = bamf_view_get_path (BAMF_VIEW (win));
+  g_assert (win == BAMF_WINDOW (bamf_matcher_get_view_by_path (matcher, win_path)));
+
+  g_object_unref (matcher);
+  g_object_unref (screen);
+}
+
 /* Initialize test suite */
 
 void
@@ -1187,6 +1223,7 @@
   g_test_add_func (DOMAIN"/AutostartDesktopFile/User", test_autostart_desktop_file_user);
   g_test_add_func (DOMAIN"/AutostartDesktopFile/System", test_autostart_desktop_file_system);
   g_test_add_func (DOMAIN"/ExecStringTrimming", test_trim_exec_string);
+  g_test_add_func (DOMAIN"/GetViewByPath", test_get_view_by_path);
   g_test_add_func (DOMAIN"/LoadDesktopFile", test_load_desktop_file);
   g_test_add_func (DOMAIN"/LoadDesktopFile/Autostart", test_load_desktop_file_autostart);
   g_test_add_func (DOMAIN"/LoadDesktopFile/NoDisplay/SameID", test_load_desktop_file_no_display_has_lower_prio_same_id);