diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-09 09:28:14 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-09 09:28:14 -0600 |
| commit | 515b77ccee47d35f07e7319e7e44e764510c1e3d (patch) | |
| tree | e4fa8fb0afd1cdd267a232058d1cdcaa9e1479db | |
| parent | 35115483c700bf370c579328c8a51e717e3947c4 (diff) | |
| parent | bfaf7c901b675655aec0fcb1c4d5ce6e059a9a80 (diff) | |
| download | ayatana-indicator-messages-515b77ccee47d35f07e7319e7e44e764510c1e3d.tar.gz ayatana-indicator-messages-515b77ccee47d35f07e7319e7e44e764510c1e3d.tar.bz2 ayatana-indicator-messages-515b77ccee47d35f07e7319e7e44e764510c1e3d.zip | |
* Upstream Merge
* Removing extra ref
* Moving locally defined variable to use the one defined in
the function to fix a NULL pointer.
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | src/app-menu-item.c | 2 | ||||
| -rw-r--r-- | src/messages-service.c | 3 |
4 files changed, 12 insertions, 3 deletions
@@ -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 2bcfdde..2a8a571 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-messages (0.3.1-0ubuntu1~ppa2) UNRELEASED; 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 <ted@ubuntu.com> Tue, 09 Feb 2010 09:27:15 -0600 + indicator-messages (0.3.1-0ubuntu1~ppa1) 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; |