aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/im-application-list.c7
-rw-r--r--src/im-phone-menu.c6
2 files changed, 5 insertions, 8 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c
index 17fffdc..950b5bc 100644
--- a/src/im-application-list.c
+++ b/src/im-application-list.c
@@ -806,14 +806,11 @@ im_application_list_source_changed (Application *app,
gint64 time;
const gchar *string;
gboolean draws_attention;
- gboolean old_draw;
gboolean visible;
g_variant_get (source, "(&s&s&sux&sb)",
&id, &label, &iconstr, &count, &time, &string, &draws_attention);
- old_draw = app_source_action_check_draw(app, id);
-
g_action_group_change_action_state (G_ACTION_GROUP (app->source_actions), id,
g_variant_new ("(uxsb)", count, time, string, draws_attention));
@@ -821,9 +818,7 @@ im_application_list_source_changed (Application *app,
g_signal_emit (app->list, signals[SOURCE_CHANGED], 0, app->id, id, label, iconstr, visible);
- if (visible && !old_draw && draws_attention)
- app->draws_attention = TRUE;
-
+ app->draws_attention = visible && draws_attention;
im_application_list_update_draws_attention (app->list);
}
diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c
index 0ea6f76..a9c5977 100644
--- a/src/im-phone-menu.c
+++ b/src/im-phone-menu.c
@@ -170,7 +170,8 @@ im_phone_menu_add_message (ImPhoneMenu *menu,
action_name = g_strconcat (app_id, ".msg.", id, NULL);
- item = g_menu_item_new (title, action_name);
+ item = g_menu_item_new (title, NULL);
+ g_menu_item_set_action_and_target_value (item, action_name, NULL);
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);
@@ -232,7 +233,8 @@ im_phone_menu_add_source (ImPhoneMenu *menu,
action_name = g_strconcat (app_id, ".src.", id, NULL);
- item = g_menu_item_new (label, action_name);
+ item = g_menu_item_new (label, NULL);
+ g_menu_item_set_action_and_target_value (item, action_name, NULL);
g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.sourceitem");
if (iconstr)