ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/indicator-messages/sir-crash-o-lot/+merge/18904
  proposed by: Ted Gould (ted)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 161 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-02-09 08:16:17 -0600
message:
  Removing the in brackets creation of a variable that also existed in the function, thus creating a NULL pointer.
modified:
  .bzrignore
  src/app-menu-item.c
  src/messages-service.c


--
lp:indicator-messages
https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-messages.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription.

=== modified file '.bzrignore'
--- .bzrignore	2009-08-26 02:40:35 +0000
+++ .bzrignore	2010-02-09 03:59:51 +0000
@@ -21,3 +21,4 @@
 indicator-messages-service-activate
 src/messages-service-client.h
 src/messages-service-server.h
+po/indicator-messages.pot

=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c	2010-02-05 02:12:10 +0000
+++ src/app-menu-item.c	2010-02-09 03:51:17 +0000
@@ -97,7 +97,7 @@
 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;

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2009-12-18 21:46:18 +0000
+++ src/messages-service.c	2010-02-09 03:54:31 +0000
@@ -821,7 +821,6 @@
 	/* 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 @@
 	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;