diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/im-menu-item.c | 19 |
2 files changed, 24 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index bf3a702..46e0cde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-messages (0.2.4-0ubuntu2~ppa3) UNRELEASED; urgency=low + + * Making it so that if applications don't set the time on an indicator + the time isn't shown in the menu. + + -- Ted Gould <ted@ubuntu.com> Wed, 30 Sep 2009 12:03:54 -0500 + indicator-messages (0.2.4-0ubuntu2~ppa2) karmic; urgency=low * Adding a check on addition of launchers to ensure icon is correctly diff --git a/src/im-menu-item.c b/src/im-menu-item.c index c2b3d12..35bb3be 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -47,6 +47,7 @@ struct _ImMenuItemPrivate IndicateListenerServer * server; IndicateListenerIndicator * indicator; + glong creation_seconds; glong seconds; gchar * count; gulong indicator_changed; @@ -132,13 +133,14 @@ im_menu_item_init (ImMenuItem *self) priv->indicator = NULL; /* A sane default, but look below */ + priv->creation_seconds = 0; priv->seconds = 0; /* Set the seconds to be the time when the item was created incase we're not given a better time. */ GTimeVal current_time; g_get_current_time(¤t_time); - priv->seconds = current_time.tv_sec; + priv->creation_seconds = current_time.tv_sec; return; } @@ -185,9 +187,17 @@ update_time (ImMenuItem * self) { ImMenuItemPrivate * priv = IM_MENU_ITEM_GET_PRIVATE(self); + /* Count has been set, so it takes priority. */ if (priv->count != NULL) { return; } + + /* Seconds hasn't been set, so we just want to keep the time + area blank. */ + if (priv->seconds == 0) { + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), INDICATOR_MENUITEM_PROP_RIGHT, ""); + return; + } gchar * timestring = NULL; @@ -449,7 +459,12 @@ im_menu_item_get_seconds (ImMenuItem * menuitem) g_return_val_if_fail(IS_IM_MENU_ITEM(menuitem), 0); ImMenuItemPrivate * priv = IM_MENU_ITEM_GET_PRIVATE(menuitem); - return priv->seconds; + + if (priv->seconds == 0) { + return priv->creation_seconds; + } else { + return priv->seconds; + } } /* Gets whether or not this indicator item is |