Merge lp:~alexlauni/indicator-messages/fix-0-count-lp1071640 into lp:indicator-messages/13.04

[Alex Launi]

Adjusts messaging menu behavior to allow for sources with a 0 count

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./label=quantal/27/console

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Ah sorry, I misunderstood you when you first described this bug to me. We can't change the behavior of messaging_menu_append_source: there are already many applications that depend on it inserting a source with a time.

I fixed this in a separate branch which clears the time when a source is set (even when that source is 0).

Thanks anyway :)

review: Disapprove

Unmerged revisions

327. By Alex Launi on 2012-10-26

Don't default to using time for sources.

=== modified file 'libmessaging-menu/messaging-menu.c'
--- libmessaging-menu/messaging-menu.c	2012-10-24 08:12:41 +0000
+++ libmessaging-menu/messaging-menu.c	2012-10-26 10:46:42 +0000
@@ -708,8 +708,8 @@
                                   GIcon            *icon,
                                   const gchar      *label)
 {
-  messaging_menu_app_insert_source_with_time (app, position, id, icon, label,
-                                              g_get_real_time ());
+  messaging_menu_app_insert_source_action (app, position, id, icon, label,
+                                           g_variant_new ("(uxsb)", 0, 0, "", FALSE));
 }
 
 /**

=== modified file 'src/im-source-menu-item.c'
--- src/im-source-menu-item.c	2012-09-03 13:45:33 +0000
+++ src/im-source-menu-item.c	2012-10-26 10:46:42 +0000
@@ -150,15 +150,15 @@
 
   g_variant_get (state, "(ux&sb)", &count, &time, &str, NULL);
 
-  if (count != 0)
-    ido_detail_label_set_count (IDO_DETAIL_LABEL (priv->detail), count);
-  else if (time != 0)
+  if (time != 0)
     {
       im_source_menu_item_set_detail_time (self, time);
       priv->timer_id = g_timeout_add_seconds (59, im_source_menu_item_update_time, self);
     }
   else if (str != NULL && *str)
     ido_detail_label_set_text (IDO_DETAIL_LABEL (priv->detail), str);
+  else
+    ido_detail_label_set_count (IDO_DETAIL_LABEL (priv->detail), count);
 
   return TRUE;
 }