From 0c9e0584a7551a043c4f5873ed439bad2943d0b5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 21:46:36 -0600 Subject: I shouldn't have to have a ref there as it's got a ref count of one. --- src/messages-service.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/messages-service.c b/src/messages-service.c index f1e1b0d..7cb5060 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -821,7 +821,6 @@ indicator_added (IndicateListener * listener, IndicateListenerServer * server, I /* Building the IM Menu Item which is a subclass of DBus Menuitem */ ImMenuItem * menuitem = im_menu_item_new(listener, server, indicator); - g_object_ref(G_OBJECT(menuitem)); listItem->menuitem = DBUSMENU_MENUITEM(menuitem); /* Looking for a server entry to attach this indicator -- cgit v1.2.3 From 985c87a1e628c585a5b629f358b3b3f98b85f2a9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 21:51:17 -0600 Subject: Fixing debug message --- src/app-menu-item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-menu-item.c b/src/app-menu-item.c index 9c51475..71860ea 100644 --- a/src/app-menu-item.c +++ b/src/app-menu-item.c @@ -97,7 +97,7 @@ app_menu_item_class_init (AppMenuItemClass *klass) static void app_menu_item_init (AppMenuItem *self) { - g_debug("Building new IM Menu Item"); + g_debug("Building new App Menu Item"); AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self); priv->listener = NULL; -- cgit v1.2.3 From 6aa477f14c1d3886540d65cac4733d3a9a0291e2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 21:54:31 -0600 Subject: Creating a local variable that was masking the one in the function. --- src/messages-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/messages-service.c b/src/messages-service.c index 7cb5060..ca9e799 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -834,7 +834,7 @@ indicator_added (IndicateListener * listener, IndicateListenerServer * server, I if (serverentry == NULL) { /* This sucks, we got an indicator before the server. I guess that's the joy of being asynchronous */ - serverList_t * sl_item = g_new0(serverList_t, 1); + sl_item = g_new0(serverList_t, 1); sl_item->server = server; sl_item->menuitem = NULL; sl_item->imList = NULL; -- cgit v1.2.3 From 2bb14b0571a7120b399051da0dca014c40162469 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 21:59:51 -0600 Subject: Kids, ignore pot --- .bzrignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.bzrignore b/.bzrignore index 1d6767c..dce3b2e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -21,3 +21,4 @@ indicator-messages-service indicator-messages-service-activate src/messages-service-client.h src/messages-service-server.h +po/indicator-messages.pot -- cgit v1.2.3 From b2c751f01da2d051a9c64c18e617c4421e1a68ad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Feb 2010 09:30:13 -0600 Subject: releasing version 0.3.1-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2a8a571..51cb432 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-messages (0.3.1-0ubuntu1~ppa2) UNRELEASED; urgency=low +indicator-messages (0.3.1-0ubuntu1~ppa2) lucid; urgency=low * Upstream Merge * Removing extra ref * Moving locally defined variable to use the one defined in the function to fix a NULL pointer. - -- Ted Gould Tue, 09 Feb 2010 09:27:15 -0600 + -- Ted Gould Tue, 09 Feb 2010 09:30:10 -0600 indicator-messages (0.3.1-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3