aboutsummaryrefslogtreecommitdiff
path: root/src/messages-service.c
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2012-11-16 15:05:39 +0100
committerLars Uebernickel <lars.uebernickel@canonical.com>2012-11-16 15:05:39 +0100
commitf371bb64a0c6d57d496def504327047ff63b11e2 (patch)
tree365111e330cf8861c8d8ef908e4c69e31888768e /src/messages-service.c
parentb55e637321b0c3fdcb5e8aafab9614f80a3228d3 (diff)
downloadayatana-indicator-messages-f371bb64a0c6d57d496def504327047ff63b11e2.tar.gz
ayatana-indicator-messages-f371bb64a0c6d57d496def504327047ff63b11e2.tar.bz2
ayatana-indicator-messages-f371bb64a0c6d57d496def504327047ff63b11e2.zip
Use different menu attributes for the phone menu
Diffstat (limited to 'src/messages-service.c')
-rw-r--r--src/messages-service.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/messages-service.c b/src/messages-service.c
index 9d64412..81b7f0b 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -209,15 +209,14 @@ messages_listed (GObject *source_object,
g_simple_action_group_insert (G_SIMPLE_ACTION_GROUP (app_actions), G_ACTION (action));
action_name = g_strconcat (app_id, ".", id, NULL);
- item = g_menu_item_new (NULL, action_name);
+ item = g_menu_item_new (title, action_name);
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-sender", "s", title);
- g_menu_item_set_attribute (item, "x-canonical-subject", "s", subtitle);
- g_menu_item_set_attribute (item, "x-canonical-body", "s", body);
+ g_menu_item_set_attribute (item, "x-canonical-subtitle", "s", subtitle);
+ g_menu_item_set_attribute (item, "x-canonical-text", "s", body);
g_menu_item_set_attribute (item, "x-canonical-time", "x", time);
if (iconstr && *iconstr)
- g_menu_item_set_attribute (item, "x-canonical-avatar", "s", iconstr);
+ g_menu_item_set_attribute (item, "x-canonical-icon", "s", iconstr);
g_menu_append_item (messages_section, item);
g_object_unref (action);
@@ -362,7 +361,7 @@ got_bus (GObject *object,
}
g_dbus_connection_export_menu_model (bus, INDICATOR_MESSAGES_DBUS_OBJECT "/phone",
- G_MENU_MODEL (toplevel_menu), &error);
+ G_MENU_MODEL (menu), &error);
if (error) {
g_warning ("unable to export menu on dbus: %s", error->message);
g_error_free (error);