diff options
| -rw-r--r-- | debian/changelog | 27 | ||||
| -rw-r--r-- | src/im-application-list.c | 7 | ||||
| -rw-r--r-- | src/im-phone-menu.c | 6 |
3 files changed, 32 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index e68d7f2..b7c5563 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +indicator-messages (13.10.1+13.10.20130828.2-0ubuntu1) saucy; urgency=low + + [ Lars Uebernickel ] + * Remove extraneous variable 'old_draw'. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 367 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 28 Aug 2013 10:08:42 +0000 + +indicator-messages (13.10.1+13.10.20130827.4-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Protect against invalid actions. (LP: #1216758) + * Remove unused and slightly used dependencies. + + [ Lars Uebernickel ] + * Fix bug #1216843 Remove all sources when an applications quits and + don't show sources with a count of 0. (LP: #1216843) + * test-client.py: flush GDBusConnection before (potentially) freeing + it. (LP: #1217131) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 365 + + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 27 Aug 2013 15:53:01 +0000 + indicator-messages (13.10.1+13.10.20130822.5-0ubuntu1) saucy; urgency=low [ Pete Woods ] 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) |