# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1184210378 0
# Node ID 8925181f26ec8635bddd1e096347c0d16c2f5cbd
# Parent  94c23019a864f43826f328f16a24eb30316661e9# Parent  34ed4e7c08cb262280b770b9d3053e9664f8bfae
merge of '171f04bfc8138c0afa445e1d787144c3cdda819e'
     and '7fc5d026fb795b53babb96d1fc137ff0d3d841c8'

diff -r 34ed4e7c08cb -r 8925181f26ec finch/gntblist.c
--- a/finch/gntblist.c	Thu Jul 12 03:17:32 2007 +0000
+++ b/finch/gntblist.c	Thu Jul 12 03:19:38 2007 +0000
@@ -139,7 +139,8 @@
 {
 	PurpleBlistNode *node;
 	for (node = ((PurpleBlistNode*)group)->child; node; node = node->next) {
-		if (PURPLE_BLIST_NODE_IS_CHAT(node))
+		if (PURPLE_BLIST_NODE_IS_CHAT(node) &&
+				purple_account_is_connected(((PurpleChat *)node)->account))
 			return TRUE;
 		else if (is_contact_online((PurpleContact*)node))
 			return TRUE;
diff -r 34ed4e7c08cb -r 8925181f26ec libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Thu Jul 12 03:17:32 2007 +0000
+++ b/libpurple/protocols/jabber/google.c	Thu Jul 12 03:19:38 2007 +0000
@@ -35,12 +35,14 @@
 	const char *type = xmlnode_get_attrib(packet, "type");
 	xmlnode *child;
 	xmlnode *message, *sender_node, *subject_node;
-	const char *from, *to, *subject, *url, *tid;
+	const char *from, *to, *url, *tid;
+	char *subject;
 	const char *in_str;
 	char *to_name;
 	int i, count = 1, returned_count;
 
-	const char **tos, **froms, **subjects, **urls;
+	const char **tos, **froms, **urls;
+	char **subjects;
 
 	if (strcmp(type, "result"))
 		return;
@@ -66,7 +68,7 @@
 
 	froms    = g_new0(const char* , returned_count);
 	tos      = g_new0(const char* , returned_count);
-	subjects = g_new0(const char* , returned_count);
+	subjects = g_new0(char* , returned_count);
 	urls     = g_new0(const char* , returned_count);
 
 	to = xmlnode_get_attrib(packet, "to");
@@ -99,7 +101,7 @@
 		 */
 		tos[i] = (to_name != NULL ?  to_name : "");
 		froms[i] = (from != NULL ?  from : "");
-		subjects[i] = (subject != NULL ? subject : "");
+		subjects[i] = (subject != NULL ? subject : g_strdup(""));
 		urls[i] = (url != NULL ? url : "");
 
 		tid = xmlnode_get_attrib(message, "tid");
@@ -111,12 +113,14 @@
 	}
 
 	if (i>0)
-		purple_notify_emails(js->gc, count, count == returned_count, subjects, froms, tos,
+		purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos,
 				urls, NULL, NULL);
 
 	g_free(to_name);
 	g_free(tos);
 	g_free(froms);
+	for (; i >= 0; i--)
+		g_free(subjects[i]);
 	g_free(subjects);
 	g_free(urls);
 
@@ -204,6 +208,8 @@
 		list = list->next;
 	}
 
+	g_free(jid_norm);
+
 }
 
 gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
@@ -236,6 +242,7 @@
 	if (grt && (*grt == 'H' || *grt == 'h')) {
 		PurpleBuddy *buddy = purple_find_buddy(account, jid_norm);
 		purple_blist_remove_buddy(buddy);
+		g_free(jid_norm);
 		return FALSE;
 	}
 
@@ -246,6 +253,8 @@
 		purple_debug_info("jabber", "Unblocking %s\n", jid_norm);
 		purple_privacy_deny_remove(account, jid_norm, TRUE);
 	}
+
+	g_free(jid_norm);
 	return TRUE;
 }
 
diff -r 34ed4e7c08cb -r 8925181f26ec po/sv.po
--- a/po/sv.po	Thu Jul 12 03:17:32 2007 +0000
+++ b/po/sv.po	Thu Jul 12 03:19:38 2007 +0000
@@ -1774,7 +1774,7 @@
 
 #: ../gtk/gtkblist.c:2542
 msgid "/Help/_About"
-msgstr "/Hjälp/_Om Gaim"
+msgstr "/Hjälp/_Om"
 
 #: ../gtk/gtkblist.c:2574
 #, c-format