# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1200417473 0
# Node ID 3afd04d5f9d6120858a6766c7d74f4d5e711dd69
# Parent  5b6d6ea542b8ed6c1d10531cbec3fd1c62e65e63
disapproval of revision '55eb5e28f52c9cdccc6229a8314ffbdac2260843'

diff -r 5b6d6ea542b8 -r 3afd04d5f9d6 libpurple/plugins/tcl/tcl_cmds.c
--- a/libpurple/plugins/tcl/tcl_cmds.c	Tue Jan 15 04:58:42 2008 +0000
+++ b/libpurple/plugins/tcl/tcl_cmds.c	Tue Jan 15 17:17:53 2008 +0000
@@ -1067,8 +1067,7 @@
 			while (cur != NULL) {
 				elem = Tcl_NewStringObj((char *)cur->data, -1);
 				Tcl_ListObjAppendElement(interp, list, elem);
-				g_free(cur->data);
-				cur = g_list_delete_link(cur, cur);
+				cur = g_list_next(cur);
 			}
 			Tcl_SetObjResult(interp, list);
 			break;
diff -r 5b6d6ea542b8 -r 3afd04d5f9d6 libpurple/plugins/test.pl
--- a/libpurple/plugins/test.pl	Tue Jan 15 04:58:42 2008 +0000
+++ b/libpurple/plugins/test.pl	Tue Jan 15 17:17:53 2008 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl -w
+
 use Gaim;
 
 %PLUGIN_INFO = (
diff -r 5b6d6ea542b8 -r 3afd04d5f9d6 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue Jan 15 04:58:42 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Jan 15 17:17:53 2008 +0000
@@ -1795,7 +1795,7 @@
 		purple_prpl_got_user_status_deactive(account, info->sn, OSCAR_STATUS_ID_MOBILE);
 	}
 
-	if (!strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE))
+	if (status_id == OSCAR_STATUS_ID_AVAILABLE)
 	{
 		char *message = NULL;
 
@@ -4456,6 +4456,7 @@
 	PurplePresence *presence;
 	PurpleStatusType *status_type;
 	PurpleStatusPrimitive primitive;
+	gboolean invisible;
 
 	char *htmlinfo;
 	char *info_encoding = NULL;
@@ -4470,6 +4471,7 @@
 	status_type = purple_status_get_type(status);
 	primitive = purple_status_type_get_primitive(status_type);
 	presence = purple_account_get_presence(account);
+	invisible = purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_INVISIBLE);
 
 	if (!setinfo)
 	{
diff -r 5b6d6ea542b8 -r 3afd04d5f9d6 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Jan 15 04:58:42 2008 +0000
+++ b/pidgin/gtkblist.c	Tue Jan 15 17:17:53 2008 +0000
@@ -3316,34 +3316,24 @@
 
 		purple_notify_user_info_destroy(user_info);
 	} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
-		gint count, total;
 		PurpleGroup *group = (PurpleGroup*)node;
 		PurpleNotifyUserInfo *user_info;
 
 		user_info = purple_notify_user_info_new();
 
-		count = purple_blist_get_group_online_count(group);
-
-		if (count != 0) {
-			/* Online buddies in group */
-			tmp = g_strdup_printf("%d", count);
-			purple_notify_user_info_add_pair(user_info,
-			                                 _("Online Buddies"),
-			                                 tmp);
-			g_free(tmp);
-		}
-		count = 0;
-
-		count = purple_blist_get_group_size(group, FALSE);
-		if (count != 0) {
-			/* Total buddies (from online accounts) in group */
-			tmp = g_strdup_printf("%d", count);
-			purple_notify_user_info_add_pair(user_info,
-			                                 _("Total Buddies"),
-			                                 tmp);
-			g_free(tmp);
-		}
-		count = 0;
+		/* Total buddies (from online accounts) in group */
+		tmp = g_strdup_printf("%d",
+		                      purple_blist_get_group_size(group, FALSE));
+		purple_notify_user_info_add_pair(user_info, _("Total Buddies"),
+		                                 tmp);
+		g_free(tmp);
+
+		/* Online buddies in group */
+		tmp = g_strdup_printf("%d",
+		                      purple_blist_get_group_online_count(group));
+		purple_notify_user_info_add_pair(user_info, _("Online Buddies"),
+		                                 tmp);
+		g_free(tmp);
 
 		tmp = purple_notify_user_info_get_text_with_newline(user_info, "\n");
 		g_string_append(str, tmp);