diff options
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | data/icons/16x16/status/Makefile.am | 2 | ||||
-rw-r--r-- | data/icons/22x22/status/Makefile.am | 2 | ||||
-rw-r--r-- | data/icons/24x24/status/Makefile.am | 2 | ||||
-rw-r--r-- | data/icons/32x32/status/Makefile.am | 2 | ||||
-rw-r--r-- | data/icons/48x48/status/Makefile.am | 2 | ||||
-rw-r--r-- | data/icons/scalable/status/Makefile.am | 2 | ||||
-rw-r--r-- | debian/changelog | 11 | ||||
-rw-r--r-- | src/im-menu-item.c | 19 | ||||
-rw-r--r-- | src/messages-service.c | 2 |
10 files changed, 40 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 1c67c9e..430203e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.4) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.5) AM_MAINTAINER_MODE @@ -53,10 +53,13 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" + INDICATORICONSDIR="${datadir}/libindicate/icons/" else INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` fi AC_SUBST(INDICATORDIR) +AC_SUBST(INDICATORICONSDIR) ########################### # DBus Service Info diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am index aba6050..e9fdeed 100644 --- a/data/icons/16x16/status/Makefile.am +++ b/data/icons/16x16/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(datadir)/indicator-applet/icons/hicolor/16x16/status +iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status icons_DATA = \ indicator-messages.png \ diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am index eaf7c32..f18bbcc 100644 --- a/data/icons/22x22/status/Makefile.am +++ b/data/icons/22x22/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(datadir)/indicator-applet/icons/hicolor/22x22/status +iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status icons_DATA = \ indicator-messages.png \ diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am index 80f8c7f..71378be 100644 --- a/data/icons/24x24/status/Makefile.am +++ b/data/icons/24x24/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(datadir)/indicator-applet/icons/hicolor/24x24/status +iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status icons_DATA = \ indicator-messages.png \ diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am index 22076b6..e34608b 100644 --- a/data/icons/32x32/status/Makefile.am +++ b/data/icons/32x32/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(datadir)/indicator-applet/icons/hicolor/32x32/status +iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status icons_DATA = \ indicator-messages.png \ diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am index 6b56cd5..69c0996 100644 --- a/data/icons/48x48/status/Makefile.am +++ b/data/icons/48x48/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(datadir)/indicator-applet/icons/hicolor/48x48/status +iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status icons_DATA = \ indicator-messages.png \ diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am index 727d291..263735a 100644 --- a/data/icons/scalable/status/Makefile.am +++ b/data/icons/scalable/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(datadir)/indicator-applet/icons/hicolor/scalable/status +iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status icons_DATA = \ indicator-messages.svg \ diff --git a/debian/changelog b/debian/changelog index 96fb856..1c57d73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-messages (0.2.5-0ubuntu1) UNRELEASED; urgency=low + + * Upstream release 0.2.5 (LP: #440217) + * Adding a check on addition of launchers to ensure icon is correctly + visible. (LP: #433274) + * Making it so that if applications don't set the time on an indicator + the time isn't shown in the menu. (LP: #438237) + * Putting icons in the right places. (LP: #436460) + + -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 15:38:41 -0500 + indicator-messages (0.2.4-0ubuntu1) karmic; urgency=low * Upstream release 0.2.4 (LP: #436093) 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; |