aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-30 12:03:35 -0500
committerTed Gould <ted@canonical.com>2009-09-30 12:03:35 -0500
commitd1cf2faaec71420c36d41fc994363677fc109dd3 (patch)
tree873a40a9d1437639ba3c88245a610693a3fd1909 /src
parent1633eacb6c9697b2a9535b565aa491ce42ec838e (diff)
parent7acd91df1e487037bbf5533d4086a74219ca204f (diff)
downloadayatana-indicator-messages-d1cf2faaec71420c36d41fc994363677fc109dd3.tar.gz
ayatana-indicator-messages-d1cf2faaec71420c36d41fc994363677fc109dd3.tar.bz2
ayatana-indicator-messages-d1cf2faaec71420c36d41fc994363677fc109dd3.zip
Adding in a check to see if the time was set, if not, don't display it in the menu item.
Diffstat (limited to 'src')
-rw-r--r--src/im-menu-item.c19
1 files changed, 17 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(&current_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