aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-09 08:16:17 -0600
committerTed Gould <ted@gould.cx>2010-02-09 08:16:17 -0600
commitbfaf7c901b675655aec0fcb1c4d5ce6e059a9a80 (patch)
tree0ff37c6535c300c02cdb45e4c2379b618debcc4e
parent8598ce722d7034a946de6b446923362bc47d8d9b (diff)
parent2bb14b0571a7120b399051da0dca014c40162469 (diff)
downloadayatana-indicator-messages-bfaf7c901b675655aec0fcb1c4d5ce6e059a9a80.tar.gz
ayatana-indicator-messages-bfaf7c901b675655aec0fcb1c4d5ce6e059a9a80.tar.bz2
ayatana-indicator-messages-bfaf7c901b675655aec0fcb1c4d5ce6e059a9a80.zip
Removing the in brackets creation of a variable that also existed in the function, thus creating a NULL pointer.
-rw-r--r--.bzrignore1
-rw-r--r--src/app-menu-item.c2
-rw-r--r--src/messages-service.c3
3 files changed, 3 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/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;