Mercurial > pidgin
comparison 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 <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Fri, 30 May 2003 18:04:45 +0000 |
| parents | 9eb5b13fd412 |
| children | c3c4aaf69f65 |
comparison
equal
deleted
inserted
replaced
| 5563:9eb5b13fd412 | 5564:187c740f2a4e |
|---|---|
| 323 | 323 |
| 324 return account->remember_pass; | 324 return account->remember_pass; |
| 325 } | 325 } |
| 326 | 326 |
| 327 int | 327 int |
| 328 gaim_account_get_int(const GaimAccount *account, const char *name) | 328 gaim_account_get_int(const GaimAccount *account, const char *name, |
| 329 int default_value) | |
| 329 { | 330 { |
| 330 GaimAccountSetting *setting; | 331 GaimAccountSetting *setting; |
| 331 | 332 |
| 332 g_return_val_if_fail(account != NULL, -1); | 333 g_return_val_if_fail(account != NULL, -1); |
| 333 g_return_val_if_fail(name != NULL, -1); | 334 g_return_val_if_fail(name != NULL, -1); |
| 334 | 335 |
| 335 setting = g_hash_table_lookup(account->settings, name); | 336 setting = g_hash_table_lookup(account->settings, name); |
| 336 | 337 |
| 338 if (setting == NULL) | |
| 339 return default_value; | |
| 340 | |
| 337 g_return_val_if_fail(setting->type == GAIM_PREF_INT, -1); | 341 g_return_val_if_fail(setting->type == GAIM_PREF_INT, -1); |
| 338 | 342 |
| 339 return setting->value.integer; | 343 return setting->value.integer; |
| 340 } | 344 } |
| 341 | 345 |
| 342 const char * | 346 const char * |
| 343 gaim_account_get_string(const GaimAccount *account, const char *name) | 347 gaim_account_get_string(const GaimAccount *account, const char *name, |
| 348 const char *default_value) | |
| 344 { | 349 { |
| 345 GaimAccountSetting *setting; | 350 GaimAccountSetting *setting; |
| 346 | 351 |
| 347 g_return_val_if_fail(account != NULL, NULL); | 352 g_return_val_if_fail(account != NULL, NULL); |
| 348 g_return_val_if_fail(name != NULL, NULL); | 353 g_return_val_if_fail(name != NULL, NULL); |
| 349 | 354 |
| 350 setting = g_hash_table_lookup(account->settings, name); | 355 setting = g_hash_table_lookup(account->settings, name); |
| 351 | 356 |
| 357 if (setting == NULL) | |
| 358 return default_value; | |
| 359 | |
| 352 g_return_val_if_fail(setting->type == GAIM_PREF_STRING, NULL); | 360 g_return_val_if_fail(setting->type == GAIM_PREF_STRING, NULL); |
| 353 | 361 |
| 354 return setting->value.string; | 362 return setting->value.string; |
| 355 } | 363 } |
| 356 | 364 |
| 357 gboolean | 365 gboolean |
| 358 gaim_account_get_bool(const GaimAccount *account, const char *name) | 366 gaim_account_get_bool(const GaimAccount *account, const char *name, |
| 367 gboolean default_value) | |
| 359 { | 368 { |
| 360 GaimAccountSetting *setting; | 369 GaimAccountSetting *setting; |
| 361 | 370 |
| 362 g_return_val_if_fail(account != NULL, FALSE); | 371 g_return_val_if_fail(account != NULL, FALSE); |
| 363 g_return_val_if_fail(name != NULL, FALSE); | 372 g_return_val_if_fail(name != NULL, FALSE); |
| 364 | 373 |
| 365 setting = g_hash_table_lookup(account->settings, name); | 374 setting = g_hash_table_lookup(account->settings, name); |
| 366 | 375 |
| 376 if (setting == NULL) | |
| 377 return default_value; | |
| 378 | |
| 367 g_return_val_if_fail(setting->type == GAIM_PREF_BOOLEAN, FALSE); | 379 g_return_val_if_fail(setting->type == GAIM_PREF_BOOLEAN, FALSE); |
| 368 | 380 |
| 369 return setting->value.bool; | 381 return setting->value.bool; |
| 370 } | 382 } |
| 371 | 383 |