Merge lp:~justinmcp/libunity-webapps/matching-fixes-13.10 into lp:libunity-webapps/13.10

[Justin McPherson]

Fix some of the matching problems.

Fix some of the matching problems.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1240
http://jenkins.qa.ubuntu.com/job/libunity-webapps-13.10-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-webapps-13.10-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-webapps-13.10-saucy-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libunity-webapps-13.10-ci/1/rebuild

review: Approve (continuous-integration)

[David Barth (dbarth)]

Good sanity checks.

Could you add a unit test for that to: tests/context-daemon/test-application-info.c
(the chmod call can be mocked up)

=== modified file 'src/context-daemon/unity-webapps-application-info.c'
--- src/context-daemon/unity-webapps-application-info.c	2013-09-24 12:42:42 +0000
+++ src/context-daemon/unity-webapps-application-info.c	2014-02-14 07:16:36 +0000
@@ -20,6 +20,7 @@
 
 #include <string.h>
 #include <gio/gio.h>
+#include <glib/gstdio.h>
 #include <libsoup/soup.h>
 
 #include "unity-webapps-application-info.h"
@@ -300,14 +301,18 @@
 gchar *
 unity_webapps_application_info_get_desktop_icon_name (UnityWebappsApplicationInfo *info, gboolean check_themed)
 {
-  gchar *canonical_name, *icon_name;
-  
-  canonical_name = unity_webapps_application_info_get_canonical_name (info);
-  
-  icon_name = g_strdup_printf("%s-%s", canonical_name, info->priv->domain);
-  
-  g_free (canonical_name);
-  
+  gchar *icon_name;
+
+  // Strip icon://
+  if (g_str_has_prefix(info->priv->icon_url, "icon://"))
+    {
+      icon_name = g_strdup(info->priv->icon_url + 7); // sizeof(icon://)
+    }
+  else
+   {
+     icon_name = g_strdup(info->priv->icon_url);
+   }
+
   return icon_name;
 }
 
@@ -344,7 +349,7 @@
   gchar **labels, **pages, **il, **ip;
   gchar *contents, *icon_name, *mime_types;
   gchar *name = unity_webapps_string_utils_canonicalize_string (info->priv->name, TRUE);
-  gchar *base64_name = g_base64_encode ((guchar*)info->priv->name, strlen (info->priv->name) + 1);
+  gchar *base64_name = g_base64_encode ((guchar*)info->priv->name, strlen (info->priv->name));
   gchar *domain = info->priv->domain ? info->priv->domain : "";
   gchar *desktop_id = unity_webapps_desktop_infos_build_desktop_basename (name, domain);
 
@@ -409,7 +414,11 @@
   desktop_file_contents = unity_webapps_application_info_get_desktop_file_contents (info);
   
   success = g_file_set_contents (desktop_file_path, desktop_file_contents, -1, error);
-  
+  if (success == TRUE)
+    {
+      g_chmod(desktop_file_path, 0744);
+    }
+
   UNITY_WEBAPPS_NOTE (APPLICATION_INFO, "Wrote desktop file: %s", desktop_file_path);
   
   g_free (desktop_file_contents);