diff libpurple/account.c @ 21418:38cc722159ff

propagate from branch 'im.pidgin.pidgin' (head d8103be97302efb404e2f6922925f661c807ad23) to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 0ac25a1f38ae28654c967caa143f1c0d12ef2e1c)

--- a/libpurple/account.c	Wed Nov 07 11:23:03 2007 +0000
+++ b/libpurple/account.c	Sat Nov 10 12:10:04 2007 +0000
@@ -60,7 +60,7 @@
 	{
 		int integer;
 		char *string;
-		gboolean bool;
+		gboolean boolean;
 
 	} value;
 
@@ -118,7 +118,7 @@
 	}
 	else if (setting->type == PURPLE_PREF_BOOLEAN) {
 		xmlnode_set_attrib(child, "type", "bool");
-		snprintf(buf, sizeof(buf), "%d", setting->value.bool);
+		snprintf(buf, sizeof(buf), "%d", setting->value.boolean);
 		xmlnode_insert_data(child, buf, -1);
 	}
 }
@@ -1709,7 +1709,7 @@
 	setting = g_new0(PurpleAccountSetting, 1);
 
 	setting->type       = PURPLE_PREF_BOOLEAN;
-	setting->value.bool = value;
+	setting->value.boolean = value;
 
 	g_hash_table_insert(account->settings, g_strdup(name), setting);
 
@@ -1795,7 +1795,7 @@
 
 	setting->type       = PURPLE_PREF_BOOLEAN;
 	setting->ui         = g_strdup(ui);
-	setting->value.bool = value;
+	setting->value.boolean = value;
 
 	table = get_ui_settings_table(account, ui);
 
@@ -2070,7 +2070,7 @@
 
 	g_return_val_if_fail(setting->type == PURPLE_PREF_BOOLEAN, default_value);
 
-	return setting->value.bool;
+	return setting->value.boolean;
 }
 
 int
@@ -2136,7 +2136,7 @@
 
 	g_return_val_if_fail(setting->type == PURPLE_PREF_BOOLEAN, default_value);
 
-	return setting->value.bool;
+	return setting->value.boolean;
 }
 
 PurpleLog *
@@ -2356,13 +2356,13 @@
 	return priv->current_error;
 }
 
-void
-purple_account_clear_current_error(PurpleAccount *account)
+static void
+signed_on_cb(PurpleConnection *gc,
+             gpointer unused)
 {
-	set_current_error(account, NULL);
+	PurpleAccount *account = purple_connection_get_account(gc);
+	purple_account_clear_current_error(account);
 }
-
-
 void
 purple_accounts_add(PurpleAccount *account)
 {