diff pidgin/gtkblist.c @ 21644:6018f0ba6aca

Patch from DB42 to add a little '¡ß' in a scrollbook. I edited the patch in a few places, and may have broken a few things. Someone should fix those. Closes #2924.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Mon, 26 Nov 2007 07:35:16 +0000
parents 1c139f0493b9
children aa5c2e52da02
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Mon Nov 26 06:41:00 2007 +0000
+++ b/pidgin/gtkblist.c	Mon Nov 26 07:35:16 2007 +0000
@@ -4230,7 +4230,7 @@
 {
 	PidginBuddyList *gtkblist = (PidginBuddyList *)user_data;
 	int errors = 0;
-	GList *list;
+	GList *list = NULL;
 	PidginBuddyListPrivate *priv;
 
 	priv = PIDGIN_BUDDY_LIST_GET_PRIVATE(gtkblist);
@@ -4243,8 +4243,7 @@
 		errors = g_list_length(GTK_NOTEBOOK(priv->error_scrollbook->notebook)->children);
 #endif
 	}
-	if ((list = purple_accounts_get_all_active()) != NULL || errors ||
-	    (list = gtk_container_get_children(GTK_CONTAINER(priv->error_scrollbook)))) {
+	if ((list = purple_accounts_get_all_active()) != NULL || errors) {
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkblist->notebook), 1);
 		g_list_free(list);
 	} else
@@ -4491,6 +4490,7 @@
                          PurpleAccount *account)
 {
 	g_hash_table_remove(gtkblist->connection_errors, account);
+	purple_account_clear_current_error(account);
 }
 
 #define SSL_FAQ_URI "http://d.pidgin.im/wiki/FAQssl"
@@ -4511,7 +4511,7 @@
 	gboolean enabled =
 		purple_account_get_enabled(account, purple_core_get_ui());
 	char *primary;
-	
+
 	if (enabled)
 		primary = g_strdup_printf(_("%s disconnected"), username);
 	else