From 4c401b08ceb4cf0659bfc4e4edc9659f6fc50fc3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 26 Oct 2009 21:06:28 -0500 Subject: releasing version 0.2.6-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70144ab..7bf474f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-messages (0.2.6-0ubuntu2~ppa1) UNRELEASED; urgency=low +indicator-messages (0.2.6-0ubuntu2~ppa1) karmic; urgency=low * Adding translator comments from hours and minutes strings. (LP: #456437) - -- Ted Gould Mon, 26 Oct 2009 21:04:54 -0500 + -- Ted Gould Mon, 26 Oct 2009 21:06:26 -0500 indicator-messages (0.2.6-0ubuntu1) karmic; urgency=low -- cgit v1.2.3 From a598083c76e9b604ab7e94873e990c42578b944c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 15:31:38 -0600 Subject: debian/control: Increasing libindicator-dev dependency to 0.3.0~dev --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98b8c30..1d77345 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ indicator-messages (0.3.0~dev-0ubuntu1~ppa1~update1) UNRELEASED; urgency=low * Porting to libindicator 0.3.0 + * debian/control: Increasing libindicator-dev dependency to + 0.3.0~dev -- Ted Gould Wed, 04 Nov 2009 15:30:10 -0600 diff --git a/debian/control b/debian/control index 08f19e3..ab92d8b 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0), intltool, libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), - libindicator-dev (>= 0.2.0~bzr301), + libindicator-dev (>= 0.3.0~dev), libdbusmenu-gtk-dev (>= 0.1.1), libdbusmenu-glib-dev (>= 0.1.1) Standards-Version: 3.8.0 -- cgit v1.2.3 From 9986d0c0c0cb732f8a72db5ea636596a26dcba1a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 15:33:23 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa1~update1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d77345..9223586 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-messages (0.3.0~dev-0ubuntu1~ppa1~update1) UNRELEASED; urgency=low +indicator-messages (0.3.0~dev-0ubuntu1~ppa1~update1) karmic; urgency=low * Porting to libindicator 0.3.0 * debian/control: Increasing libindicator-dev dependency to 0.3.0~dev - -- Ted Gould Wed, 04 Nov 2009 15:30:10 -0600 + -- Ted Gould Wed, 04 Nov 2009 15:33:19 -0600 indicator-messages (0.2.6-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From 93de674a6f904d66f649b7aa5df7c4f596406bbd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 5 Nov 2009 09:31:00 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 84be776..123dc2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-messages (0.3.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-messages (0.3.0~dev-0ubuntu1~ppa1) karmic; urgency=low * Porting to libindicator 0.3.0 * debian/control: Increasing libindicator-dev dependency to 0.3.0~dev - -- Ted Gould Thu, 05 Nov 2009 09:29:47 -0600 + -- Ted Gould Thu, 05 Nov 2009 09:30:58 -0600 indicator-messages (0.2.6-0ubuntu2~ppa1) karmic; urgency=low -- cgit v1.2.3 From 38a59145e520cc7758af733fee3855705be056d4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 16 Nov 2009 11:44:39 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a9641f4..7592cfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-messages (0.3.0~dev-0ubuntu1~ppa2) UNRELEASED; urgency=low +indicator-messages (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low * Disabling static builds. - -- Ted Gould Mon, 16 Nov 2009 11:43:19 -0600 + -- Ted Gould Mon, 16 Nov 2009 11:44:37 -0600 indicator-messages (0.3.0~dev-0ubuntu1~ppa1) karmic; urgency=low -- cgit v1.2.3 From ab54c52997d6c631f53648657709020e557a9c1b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Dec 2009 15:35:11 -0600 Subject: Requiring the 0.2.x series of dbusmenu --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 29231a8..db3e80d 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 INDICATE_REQUIRED_VERSION=0.2.0 INDICATOR_REQUIRED_VERSION=0.3.0 -DBUSMENUGTK_REQUIRED_VERSION=0.1.1 +DBUSMENUGTK_REQUIRED_VERSION=0.2.0 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION -- cgit v1.2.3 From e0fabde50e1c885faf6e3b435842d52430a69e20 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Dec 2009 15:43:41 -0600 Subject: Switching the property callback to be GValue --- src/indicator-messages.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 54e67c9..acb2e68 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -218,14 +218,14 @@ struct _indicator_item_t { /* Whenever we have a property change on a DbusmenuMenuitem we need to be responsive to that. */ static void -indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, gchar * value, indicator_item_t * mi_data) +indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data) { if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) { /* Set the main label */ - gtk_label_set_text(GTK_LABEL(mi_data->label), value); + gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value)); } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) { /* Set the right label */ - gtk_label_set_text(GTK_LABEL(mi_data->right), value); + gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value)); } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) { /* We don't use the value here, which is probably less efficient, but it's easier to use the easy function. And since th value @@ -351,7 +351,7 @@ new_launcher_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusme GtkWidget * app_label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_NAME)); gtk_misc_set_alignment(GTK_MISC(app_label), 0.0, 0.5); GtkWidget * dsc_label = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.05, 0.5); + gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.0, 0.5); gtk_label_set_ellipsize(GTK_LABEL(dsc_label), PANGO_ELLIPSIZE_END); gtk_widget_set_size_request(dsc_label, 200, -1); gchar * markup = g_markup_printf_escaped("%s", dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_DESC)); -- cgit v1.2.3 From 2e661e35575a77338acb08e6d3707c978d6e1b08 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Dec 2009 15:46:18 -0600 Subject: Switching type to use the #define --- src/im-menu-item.c | 2 +- src/launcher-menu-item.c | 2 +- src/messages-service.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/im-menu-item.c b/src/im-menu-item.c index 9ea7ec7..035b2da 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -442,7 +442,7 @@ im_menu_item_new (IndicateListener * listener, IndicateListenerServer * server, priv->attention = FALSE; priv->show = TRUE; - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", INDICATOR_MENUITEM_TYPE); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, INDICATOR_MENUITEM_TYPE); indicate_listener_displayed(listener, server, indicator, TRUE); diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 5afe7a9..d203bba 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -131,7 +131,7 @@ launcher_menu_item_new (const gchar * desktop_file) priv->desktop = g_strdup(desktop_file); g_debug("\tName: %s", launcher_menu_item_get_name(self)); - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", LAUNCHER_MENUITEM_TYPE); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, LAUNCHER_MENUITEM_TYPE); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self)); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_DESC, launcher_menu_item_get_description(self)); diff --git a/src/messages-service.c b/src/messages-service.c index f5681b7..f1e1b0d 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -488,7 +488,7 @@ server_added (IndicateListener * listener, IndicateListenerServer * server, gcha /* Build a separator */ sl_item->separator = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(sl_item->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR); + dbusmenu_menuitem_property_set(sl_item->separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); /* Incase we got an indicator first */ GList * alreadythere = g_list_find_custom(serverList, sl_item, serverList_equal); @@ -1139,7 +1139,7 @@ build_launcher (gpointer data) /* Build a separator */ ll->separator = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(ll->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR); + dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); /* Add it to the list */ launcherList = g_list_insert_sorted(launcherList, ll, launcherList_sort); -- cgit v1.2.3 From 0ed356bf5bd719b21126e6114c2badc22570abbd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Dec 2009 20:59:21 -0600 Subject: debian/control: Updating dbusmenu dependency to 0.2.0~dev --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcb7f82..813a5b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ indicator-messages (0.3.0~dev-0ubuntu1~ppa3~dbm1) UNRELEASED; urgency=low * Upgrading to dbusmenu 0.2.0 + * debian/control: Updating dbusmenu dependency to 0.2.0~dev -- Ted Gould Fri, 18 Dec 2009 20:57:30 -0600 diff --git a/debian/control b/debian/control index ab92d8b..0023281 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.0~dev), - libdbusmenu-gtk-dev (>= 0.1.1), - libdbusmenu-glib-dev (>= 0.1.1) + libdbusmenu-gtk-dev (>= 0.2.0~dev), + libdbusmenu-glib-dev (>= 0.2.0~dev) Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu -- cgit v1.2.3 From 6fbe037c013991a4a5ee5be9ff778a6c08d25770 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Dec 2009 21:00:16 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa3~dbm1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 813a5b1..bfa344d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-messages (0.3.0~dev-0ubuntu1~ppa3~dbm1) UNRELEASED; urgency=low +indicator-messages (0.3.0~dev-0ubuntu1~ppa3~dbm1) karmic; urgency=low * Upgrading to dbusmenu 0.2.0 * debian/control: Updating dbusmenu dependency to 0.2.0~dev - -- Ted Gould Fri, 18 Dec 2009 20:57:30 -0600 + -- Ted Gould Fri, 18 Dec 2009 21:00:12 -0600 indicator-messages (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low -- cgit v1.2.3 From 4ad585c9866a98a6318c44d3d6a52a82ae773ce1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 22 Dec 2009 14:49:52 -0600 Subject: releasing version 0.3.0~dev-0ubuntu1~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2a72da..29f8175 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-messages (0.3.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low +indicator-messages (0.3.0~dev-0ubuntu1~ppa3) karmic; urgency=low * Upgrading to dbusmenu 0.2.0 * debian/control: Updating dbusmenu dependency to 0.2.0~dev - -- Ted Gould Tue, 22 Dec 2009 14:48:35 -0600 + -- Ted Gould Tue, 22 Dec 2009 14:49:49 -0600 indicator-messages (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low -- cgit v1.2.3 From dbb73cabdd6822729c5d5974bac3345cc5f74820 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Jan 2010 12:00:55 -0600 Subject: 0.3.0 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index db3e80d..cdffa27 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.6) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.0) AM_MAINTAINER_MODE -- cgit v1.2.3 From 0d4e6169ff7a28d62ce785fd61aecc201418a27a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Jan 2010 12:05:27 -0600 Subject: releasing version 0.3.0-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8fa1f9..75adc13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-messages (0.3.0-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-messages (0.3.0-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.3.0 - -- Ted Gould Fri, 08 Jan 2010 12:04:18 -0600 + -- Ted Gould Fri, 08 Jan 2010 12:05:25 -0600 indicator-messages (0.3.0~dev-0ubuntu1~ppa3) karmic; urgency=low -- cgit v1.2.3