diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/im-menu-item.c | 19 | ||||
| -rw-r--r-- | src/messages-service.c | 2 |
2 files changed, 19 insertions, 2 deletions
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 diff --git a/src/messages-service.c b/src/messages-service.c index 65c9af7..754d7ee 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -1156,6 +1156,8 @@ build_launcher (gpointer data) launcher_menu_item_set_eclipsed(ll->menuitem, TRUE); dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); } + + check_hidden(); } else { /* If so add ourselves */ launcherList_t * ll = (launcherList_t *)listitem->data; |