Merge lp:~larsu/indicator-messages/lp1231435 into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

[Lars Karlitski]

im-application-list: show all sources that have a count, time, or non-empty string

im-application-list: show all sources that have a count, time, or non-empty string

This is a regression introduced with the branch consolidation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:380
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/95/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/48/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/95/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

seems fine to me and makes xchat-gnome happy!

review: Approve

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2013-09-12 11:30:04 +0000
+++ src/im-application-list.c	2013-09-26 14:56:49 +0000
@@ -830,7 +830,7 @@
   g_action_group_change_action_state (G_ACTION_GROUP (app->source_actions), id,
                                       g_variant_new ("(uxsb)", count, time, string, draws_attention));
 
-  visible = count > 0;
+  visible = count > 0 || time != 0 || (string != NULL && string[0] != '\0');
 
   g_signal_emit (app->list, signals[SOURCE_CHANGED], 0, app->id, id, label, serialized_icon, visible);