Merge trunk positions

4 files changed, 52 insertions, 3 deletions

diff --git a/data/com.canonical.indicator.messages b/data/com.canonical.indicator.messages
index f08a1bc..572a4a7 100644
--- a/data/com.canonical.indicator.messages
+++ b/data/com.canonical.indicator.messages
@@ -11,7 +11,9 @@ ObjectPath=/com/canonical/indicator/messages/desktop_greeter
 
 [phone]
 ObjectPath=/com/canonical/indicator/messages/phone
+Position=100
 
 [phone_greeter]
 ObjectPath=/com/canonical/indicator/messages/phone_greeter
+Position=100
 
diff --git a/debian/changelog b/debian/changelog
index 9f22075..f72b140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+indicator-messages (13.10.1+14.10.20141006-0ubuntu1) utopic; urgency=low
+
+  [ Charles Kerr ]
+  * Move the position of this indicator on the panel. (LP: #1377294)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 06 Oct 2014 17:25:02 +0000
+
+indicator-messages (13.10.1+14.10.20140925-0ubuntu1) utopic; urgency=low
+
+  [ Lars Uebernickel ]
+  * Support X-Ubuntu-SymbolicIcon in desktop files (LP: #1365408)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 25 Sep 2014 14:41:04 +0000
+
+indicator-messages (13.10.1+14.10.20140814.1-0ubuntu2) utopic; urgency=low
+
+  * Add "Multi-Arch: same" to libmessaging-menu0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Sep 2014 11:17:34 +0200
+
 indicator-messages (13.10.1+14.10.20140814.1-0ubuntu1) utopic; urgency=low
 
   [ Charles Kerr ]
diff --git a/debian/control b/debian/control
index 8b46af7..5cdba7d 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,7 @@ Description: indicator that collects messages that need a response
 
 Package: libmessaging-menu0
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
diff --git a/src/im-application-list.c b/src/im-application-list.c
index 001266e..ac9b255 100644
--- a/src/im-application-list.c
+++ b/src/im-application-list.c
@@ -895,14 +895,40 @@ im_application_list_sources_listed (GObject      *source_object,
 }
 
 static GIcon *
-get_symbolic_app_icon (GAppInfo *info)
+get_symbolic_app_icon (GDesktopAppInfo *info)
 {
+  gchar *x_symbolic_icon;
   GIcon *icon;
   const gchar * const *names;
   gchar *symbolic_name;
   GIcon *symbolic_icon;
 
-  icon = g_app_info_get_icon (info);
+  /* If X-Ubuntu-SymbolicIcon exists, use that. It is always interpreted
+   * as a filename.
+   *
+   * Simply appending -symbolic to the normal icon doesn't work for
+   * icons specified by file name, because the symbolic icon might be in
+   * a different format (symbolic icons tend to be svg and normal icons
+   * png). Also, icons specified by file names don't allow for fallbacks
+   * (without stating the file from this process), and we'd want to fall
+   * back to the normal app icon.
+   *
+   * See lp: #1365408
+   */
+  if ((x_symbolic_icon = g_desktop_app_info_get_string (info, "X-Ubuntu-SymbolicIcon")))
+    {
+      GFile *file;
+
+      file = g_file_new_for_path (x_symbolic_icon);
+      symbolic_icon = g_file_icon_new (file);
+
+      g_object_unref (file);
+      g_free (x_symbolic_icon);
+
+      return symbolic_icon;
+    }
+
+  icon = g_app_info_get_icon (G_APP_INFO (info));
   if (icon == NULL)
     return NULL;
 
@@ -1023,7 +1049,7 @@ im_application_list_message_added (Application *app,
       im_application_list_update_root_action (app->list);
     }
 
-  app_icon = get_symbolic_app_icon (G_APP_INFO (app->info));
+  app_icon = get_symbolic_app_icon (app->info);
 
   g_signal_emit (app->list, signals[MESSAGE_ADDED], 0,
                  app->id, app_icon, id, serialized_icon, title,