aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--src/im-phone-menu.c12
-rw-r--r--src/messages-service.c4
3 files changed, 11 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index 9458a99..287e7e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-messages (12.10.6-0ubuntu1phablet6) quantal; urgency=low
+
+ * Don't show sources
+ * Always use the "messageitem" widget type for messages
+
+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com> Mon, 10 Dec 2012 14:38:16 +0100
+
indicator-messages (12.10.6-0ubuntu1phablet5) quantal; urgency=low
* Don't shorten the app id to seven characters (fixes LP #1086729)
diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c
index ed28023..83363d1 100644
--- a/src/im-phone-menu.c
+++ b/src/im-phone-menu.c
@@ -164,14 +164,7 @@ im_phone_menu_add_message (ImPhoneMenu *menu,
item = g_menu_item_new (title, action_name);
- if (g_variant_n_children (actions))
- {
- g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.snapdecision");
- g_menu_item_set_attribute (item, "x-canonical-message-actions", "v", actions);
- }
- else
- g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.messageitem");
-
+ g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.messageitem");
g_menu_item_set_attribute (item, "x-canonical-message-id", "s", id);
g_menu_item_set_attribute (item, "x-canonical-subtitle", "s", subtitle);
g_menu_item_set_attribute (item, "x-canonical-text", "s", body);
@@ -183,6 +176,9 @@ im_phone_menu_add_message (ImPhoneMenu *menu,
if (app_icon)
g_menu_item_set_attribute (item, "x-canonical-app-icon", "s", app_icon);
+ if (actions)
+ g_menu_item_set_attribute (item, "x-canonical-message-actions", "v", actions);
+
g_menu_prepend_item (menu->message_section, item);
g_free (action_name);
diff --git a/src/messages-service.c b/src/messages-service.c
index d10e98a..27bce4e 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -166,10 +166,6 @@ main (int argc, char ** argv)
settings = g_settings_new ("com.canonical.indicator.messages");
applications = im_application_list_new ();
- g_signal_connect_swapped (applications, "source-added",
- G_CALLBACK (im_phone_menu_add_source), menu);
- g_signal_connect_swapped (applications, "source-removed",
- G_CALLBACK (im_phone_menu_remove_source), menu);
g_signal_connect_swapped (applications, "message-added",
G_CALLBACK (im_phone_menu_add_message), menu);
g_signal_connect_swapped (applications, "message-removed",