diff src/account.c @ 5564:187c740f2a4e

[gaim-migrate @ 5966] Committing what I have so far. Some new functions, and msn is almost done. committer: Tailor Script <[e-mail]>

--- a/src/account.c	Fri May 30 09:38:29 2003 +0000
+++ b/src/account.c	Fri May 30 18:04:45 2003 +0000
@@ -325,7 +325,8 @@
 }
 
 int
-gaim_account_get_int(const GaimAccount *account, const char *name)
+gaim_account_get_int(const GaimAccount *account, const char *name,
+					 int default_value)
 {
 	GaimAccountSetting *setting;
 
@@ -334,13 +335,17 @@
 
 	setting = g_hash_table_lookup(account->settings, name);
 
+	if (setting == NULL)
+		return default_value;
+
 	g_return_val_if_fail(setting->type == GAIM_PREF_INT, -1);
 
 	return setting->value.integer;
 }
 
 const char *
-gaim_account_get_string(const GaimAccount *account, const char *name)
+gaim_account_get_string(const GaimAccount *account, const char *name,
+						const char *default_value)
 {
 	GaimAccountSetting *setting;
 
@@ -349,13 +354,17 @@
 
 	setting = g_hash_table_lookup(account->settings, name);
 
+	if (setting == NULL)
+		return default_value;
+
 	g_return_val_if_fail(setting->type == GAIM_PREF_STRING, NULL);
 
 	return setting->value.string;
 }
 
 gboolean
-gaim_account_get_bool(const GaimAccount *account, const char *name)
+gaim_account_get_bool(const GaimAccount *account, const char *name,
+					  gboolean default_value)
 {
 	GaimAccountSetting *setting;
 
@@ -364,6 +373,9 @@
 
 	setting = g_hash_table_lookup(account->settings, name);
 
+	if (setting == NULL)
+		return default_value;
+
 	g_return_val_if_fail(setting->type == GAIM_PREF_BOOLEAN, FALSE);
 
 	return setting->value.bool;