# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1192942483 0
# Node ID 01101467094f01b5658e546e5a784866039b34fd
# Parent  a482263cf1d8152f5504ffa965fc85fc2ed1e6ef
applied changes from 7a436ba53de6adebccf4e920ca62d544e13b1094
             through 5473bd4fec59a55c8ad482c92cc518fea564a241

diff -r a482263cf1d8 -r 01101467094f libpurple/account.c
--- a/libpurple/account.c	Sun Oct 21 04:53:02 2007 +0000
+++ b/libpurple/account.c	Sun Oct 21 04:54:43 2007 +0000
@@ -52,7 +52,7 @@
 	{
 		int integer;
 		char *string;
-		gboolean bool;
+		gboolean boolean;
 
 	} value;
 
@@ -104,7 +104,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);
 	}
 }
@@ -1578,7 +1578,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);
 
@@ -1664,7 +1664,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);
 
@@ -1939,7 +1939,7 @@
 
 	g_return_val_if_fail(setting->type == PURPLE_PREF_BOOLEAN, default_value);
 
-	return setting->value.bool;
+	return setting->value.boolean;
 }
 
 int
@@ -2005,7 +2005,7 @@
 
 	g_return_val_if_fail(setting->type == PURPLE_PREF_BOOLEAN, default_value);
 
-	return setting->value.bool;
+	return setting->value.boolean;
 }
 
 PurpleLog *