summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Schierer <lschiere@pidgin.im>2007-10-21 04:54:43 +0000
committerLuke Schierer <lschiere@pidgin.im>2007-10-21 04:54:43 +0000
commit0035c916f594db76e41659222ea2ba0cb40b664d (patch)
tree1f92b3a4dc0a3d42a861592b5c42c8323407519d
parentaf85d0ec4c94ac0487c6ebc6c0dd6b1aead7bd7a (diff)
downloadpidgin-0035c916f594db76e41659222ea2ba0cb40b664d.tar.gz
applied changes from 7a436ba53de6adebccf4e920ca62d544e13b1094
through 5473bd4fec59a55c8ad482c92cc518fea564a241
-rw-r--r--libpurple/account.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libpurple/account.c b/libpurple/account.c
index bf82f79699..f1dd93c1b7 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -52,7 +52,7 @@ typedef struct
{
int integer;
char *string;
- gboolean bool;
+ gboolean boolean;
} value;
@@ -104,7 +104,7 @@ setting_to_xmlnode(gpointer key, gpointer value, gpointer user_data)
}
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 @@ purple_account_set_bool(PurpleAccount *account, const char *name, gboolean value
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 @@ purple_account_set_ui_bool(PurpleAccount *account, const char *ui,
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 @@ purple_account_get_bool(const PurpleAccount *account, const char *name,
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 @@ purple_account_get_ui_bool(const PurpleAccount *account, const char *ui,
g_return_val_if_fail(setting->type == PURPLE_PREF_BOOLEAN, default_value);
- return setting->value.bool;
+ return setting->value.boolean;
}
PurpleLog *