aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-04-07 13:13:03 -0500
committerTed Gould <ted@canonical.com>2009-04-07 13:13:03 -0500
commite6565d2bf8f65c2da616d4e5a6b04adc8ee382fe (patch)
tree8ccff2a84b71f01bdc40fd94ad53dec6f7d9dcad
parentf63255dc26631841c60663e760ebf71c7eed1d4a (diff)
parent33aaf28aafac744cde4375df44db4bd1c9a02696 (diff)
downloadayatana-indicator-messages-e6565d2bf8f65c2da616d4e5a6b04adc8ee382fe.tar.gz
ayatana-indicator-messages-e6565d2bf8f65c2da616d4e5a6b04adc8ee382fe.tar.bz2
ayatana-indicator-messages-e6565d2bf8f65c2da616d4e5a6b04adc8ee382fe.zip
More upstream.
-rw-r--r--debian/changelog1
-rw-r--r--src/indicator-messages.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 7d277e8..65ea31a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ indicator-messages (0.1.4-0ubuntu2~ppa3) UNRELEASED; urgency=low
* New upstream merge
* Now with better linkage.
* Bah, right symbol
+ * More upstream.
-- Ted Gould <ted@ubuntu.com> Fri, 03 Apr 2009 16:32:49 -0500
diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index bf9cd04..66519f4 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -139,7 +139,7 @@ server_added (IndicateListener * listener, IndicateListenerServer * server, gcha
g_signal_connect(G_OBJECT(menuitem), APP_MENU_ITEM_SIGNAL_COUNT_CHANGED, G_CALLBACK(server_count_changed), NULL);
g_signal_connect(G_OBJECT(menuitem), APP_MENU_ITEM_SIGNAL_NAME_CHANGED, G_CALLBACK(server_name_changed), menushell);
- serverList_t * sl_item = g_new(serverList_t, 1);
+ serverList_t * sl_item = g_new0(serverList_t, 1);
sl_item->server = server;
sl_item->menuitem = menuitem;
sl_item->imList = NULL;
@@ -343,7 +343,7 @@ subtype_cb (IndicateListener * listener, IndicateListenerServer * server, Indica
g_debug("Message subtype: %s", propertydata);
if (!strcmp(propertydata, "im") || !strcmp(propertydata, "login")) {
- imList_t * listItem = g_new(imList_t, 1);
+ imList_t * listItem = g_new0(imList_t, 1);
listItem->server = server;
listItem->indicator = indicator;
@@ -361,7 +361,7 @@ subtype_cb (IndicateListener * listener, IndicateListenerServer * server, Indica
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_new(serverList_t, 1);
+ serverList_t * sl_item = g_new0(serverList_t, 1);
sl_item->server = server;
sl_item->menuitem = NULL;
sl_item->imList = NULL;