aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore1
-rw-r--r--debian/changelog9
-rw-r--r--src/app-menu-item.c2
-rw-r--r--src/messages-service.c3
4 files changed, 12 insertions, 3 deletions
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
diff --git a/debian/changelog b/debian/changelog
index c1cd592..572d63f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-messages (0.3.1-0ubuntu2) 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. (lp: #518547)
+
+ -- Ted Gould <ted@ubuntu.com> Tue, 09 Feb 2010 09:30:10 -0600
+
indicator-messages (0.3.1-0ubuntu1) lucid; urgency=low
* Upstream release 0.3.1
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;
diff --git a/src/messages-service.c b/src/messages-service.c
index f1e1b0d..ca9e799 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
@@ -835,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;