From f6ddb730384d185c5d35c72481862c5d94579490 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Sep 2014 13:56:00 +0200 Subject: Add "Multi-Arch: same" to libmessaging-menu0 --- debian/changelog | 6 ++++++ debian/control | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9f22075..0201911 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-messages (13.10.1+14.10.20140814.1-0ubuntu2) utopic; urgency=low + + * Add "Multi-Arch: same" to libmessaging-menu0 + + -- Michael Vogt 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 164cded..b2c899d 100644 --- a/debian/control +++ b/debian/control @@ -51,6 +51,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}, -- cgit v1.2.3 From 9857406201fa92d88e9b66650e43a2ea3cc6f52c Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 16 Sep 2014 16:58:47 +0200 Subject: Support X-Ubuntu-SymbolicIcon in desktop files As a way for applications to supply symbolic icons which are not in the theme but specified by file name. --- src/im-application-list.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/im-application-list.c b/src/im-application-list.c index b926e77..15e661e 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -886,14 +886,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; @@ -1014,7 +1040,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, -- cgit v1.2.3 From 72114e343104aaabb108e73f4e845a9eedd8f385 Mon Sep 17 00:00:00 2001 From: CI bot Date: Thu, 25 Sep 2014 14:41:04 +0000 Subject: Releasing 13.10.1+14.10.20140925-0ubuntu1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0201911..200b5c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 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 -- cgit v1.2.3 From d5e285f35bb11213f2a232360dce32a41ea8c918 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 6 Oct 2014 10:48:23 -0500 Subject: move indicator as per the 'Indicator RTM Usability Fixes' document --- data/com.canonical.indicator.messages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/com.canonical.indicator.messages b/data/com.canonical.indicator.messages index 2bc6156..7e41800 100644 --- a/data/com.canonical.indicator.messages +++ b/data/com.canonical.indicator.messages @@ -1,7 +1,7 @@ [Indicator Service] Name=indicator-messages ObjectPath=/com/canonical/indicator/messages -Position=50 +Position=100 [desktop] ObjectPath=/com/canonical/indicator/messages/desktop -- cgit v1.2.3 From 119792e2219fe326c34298b8d17a6db0446f0e0e Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 6 Oct 2014 11:53:34 -0500 Subject: only rearrange the indicator position on the phone --- data/com.canonical.indicator.messages | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/com.canonical.indicator.messages b/data/com.canonical.indicator.messages index 7e41800..2210b6b 100644 --- a/data/com.canonical.indicator.messages +++ b/data/com.canonical.indicator.messages @@ -1,14 +1,16 @@ [Indicator Service] Name=indicator-messages ObjectPath=/com/canonical/indicator/messages -Position=100 +Position=50 [desktop] ObjectPath=/com/canonical/indicator/messages/desktop [phone] ObjectPath=/com/canonical/indicator/messages/phone +Position=100 [phone_greeter] ObjectPath=/com/canonical/indicator/messages/phone +Position=100 -- cgit v1.2.3 From 726a04ec23d83b986201992adeeb1fef67ad615e Mon Sep 17 00:00:00 2001 From: CI bot Date: Mon, 6 Oct 2014 17:25:03 +0000 Subject: Releasing 13.10.1+14.10.20141006-0ubuntu1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 200b5c9..f72b140 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 Mon, 06 Oct 2014 17:25:02 +0000 + indicator-messages (13.10.1+14.10.20140925-0ubuntu1) utopic; urgency=low [ Lars Uebernickel ] -- cgit v1.2.3