From 9871db50a909471a3bfe1d44e02daff93fd99c3b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 24 Sep 2009 20:25:44 -0500 Subject: Adding in a variable for the icon directory. --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 1c67c9e..a338fea 100644 --- a/configure.ac +++ b/configure.ac @@ -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 -- cgit v1.2.3 From 1663b9c4812700bb2da614b47c84ee63e167dea6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 24 Sep 2009 20:28:38 -0500 Subject: Using the new icon directory define. --- data/icons/16x16/status/Makefile.am | 2 +- data/icons/22x22/status/Makefile.am | 2 +- data/icons/24x24/status/Makefile.am | 2 +- data/icons/32x32/status/Makefile.am | 2 +- data/icons/48x48/status/Makefile.am | 2 +- data/icons/scalable/status/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 \ -- cgit v1.2.3 From a1af845c49338a4a1b78502693d2ee4824330ae9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 28 Sep 2009 21:39:42 -0500 Subject: releasing version 0.2.4-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc61887..738f1bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-messages (0.2.4-0ubuntu2~ppa1) UNRELEASED; urgency=low +indicator-messages (0.2.4-0ubuntu2~ppa1) karmic; urgency=low * Putting icons in the right places - -- Ted Gould Mon, 28 Sep 2009 21:37:57 -0500 + -- Ted Gould Mon, 28 Sep 2009 21:39:39 -0500 indicator-messages (0.2.4-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From 74a0e3211895e681b1c3c40c102083b41f5521dd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 29 Sep 2009 16:04:25 -0500 Subject: Checking to see if the menu should get un-hidden when we're installing new launchers. --- src/messages-service.c | 2 ++ 1 file changed, 2 insertions(+) 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; -- cgit v1.2.3 From 3cea4956ce8903612e1789d96734c661ff296455 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 29 Sep 2009 16:09:29 -0500 Subject: releasing version 0.2.4-0ubuntu2~ppa2~disappearingmenu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a174b2f..b1bd598 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-messages (0.2.4-0ubuntu2~ppa2~disappearingmenu1) UNRELEASED; urgency=low +indicator-messages (0.2.4-0ubuntu2~ppa2~disappearingmenu1) karmic; urgency=low * Fix for the diappearing menu. - -- Ted Gould Tue, 29 Sep 2009 16:08:08 -0500 + -- Ted Gould Tue, 29 Sep 2009 16:09:27 -0500 indicator-messages (0.2.4-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From cf185b650bc83909d1e93c2c613e9c9982ac8da9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 29 Sep 2009 16:43:06 -0500 Subject: Adding in a creation seconds and returning that if seconds isn't set. --- src/im-menu-item.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/im-menu-item.c b/src/im-menu-item.c index c2b3d12..4357dee 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; } @@ -449,7 +451,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 -- cgit v1.2.3 From 7acd91df1e487037bbf5533d4086a74219ca204f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 29 Sep 2009 16:46:18 -0500 Subject: Making sure we don't update the text for the time if it's zero. --- src/im-menu-item.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/im-menu-item.c b/src/im-menu-item.c index 4357dee..35bb3be 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -187,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; -- cgit v1.2.3 From 092563e72b12128179a1f26cd43ae205104dc79f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 12:01:53 -0500 Subject: releasing version 0.2.4-0ubuntu2~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83450fb..bf3a702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-messages (0.2.4-0ubuntu2~ppa2) UNRELEASED; urgency=low +indicator-messages (0.2.4-0ubuntu2~ppa2) karmic; urgency=low * Adding a check on addition of launchers to ensure icon is correctly visible. (LP: #433274) - -- Ted Gould Wed, 30 Sep 2009 11:59:57 -0500 + -- Ted Gould Wed, 30 Sep 2009 12:01:50 -0500 indicator-messages (0.2.4-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From b9e0e60f145cbe4e7d767285220cdc39100727da Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Sep 2009 12:04:55 -0500 Subject: releasing version 0.2.4-0ubuntu2~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 46e0cde..fb7881b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-messages (0.2.4-0ubuntu2~ppa3) UNRELEASED; urgency=low +indicator-messages (0.2.4-0ubuntu2~ppa3) karmic; 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 Wed, 30 Sep 2009 12:03:54 -0500 + -- Ted Gould Wed, 30 Sep 2009 12:04:52 -0500 indicator-messages (0.2.4-0ubuntu2~ppa2) karmic; urgency=low -- cgit v1.2.3 From 6065e9e4c3c66cedcfee2059a556a04b05d49009 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 15:34:56 -0500 Subject: 0.2.5 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a338fea..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 -- cgit v1.2.3 From 85a2a2321591f82582236d65ff2198a510520ed4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 1 Oct 2009 15:38:43 -0500 Subject: releasing version 0.2.5-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f2bcec4..5104621 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-messages (0.2.5-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-messages (0.2.5-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.2.5 * Adding a check on addition of launchers to ensure icon is correctly @@ -7,7 +7,7 @@ indicator-messages (0.2.5-0ubuntu1~ppa1) UNRELEASED; urgency=low the time isn't shown in the menu. (LP: #438237) * Putting icons in the right places. (LP: #436460) - -- Ted Gould Thu, 01 Oct 2009 15:36:08 -0500 + -- Ted Gould Thu, 01 Oct 2009 15:38:41 -0500 indicator-messages (0.2.4-0ubuntu1) karmic; urgency=low -- cgit v1.2.3