comparison: pidgin/prefs/pidginprefs.c
pidgin/prefs/pidginprefs.c
- changeset 41388
- 4df8fa04b777
- parent 41387
- 146db40a9f24
- child 41390
- 628971e4ecdf
equal
deleted
inserted
replaced
| 41387:146db40a9f24 | 41388:4df8fa04b777 |
|---|---|
| 221 if (type == PURPLE_PREF_INT) { | 221 if (type == PURPLE_PREF_INT) { |
| 222 gint value; | 222 gint value; |
| 223 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); | 223 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); |
| 224 purple_prefs_set_int(key, value); | 224 purple_prefs_set_int(key, value); |
| 225 } else if (type == PURPLE_PREF_STRING) { | 225 } else if (type == PURPLE_PREF_STRING) { |
| 226 const char *value; | 226 gchar *value; |
| 227 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); | 227 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); |
| 228 purple_prefs_set_string(key, value); | 228 purple_prefs_set_string(key, value); |
| 229 g_free(value); | |
| 229 } else if (type == PURPLE_PREF_BOOLEAN) { | 230 } else if (type == PURPLE_PREF_BOOLEAN) { |
| 230 gboolean value; | 231 gboolean value; |
| 231 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); | 232 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); |
| 232 purple_prefs_set_bool(key, value); | 233 purple_prefs_set_bool(key, value); |
| 233 } else { | 234 } else { |
| 370 if (combo->type == PURPLE_PREF_INT) { | 371 if (combo->type == PURPLE_PREF_INT) { |
| 371 gint value; | 372 gint value; |
| 372 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); | 373 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); |
| 373 purple_prefs_set_int(combo->key, value); | 374 purple_prefs_set_int(combo->key, value); |
| 374 } else if (combo->type == PURPLE_PREF_STRING) { | 375 } else if (combo->type == PURPLE_PREF_STRING) { |
| 375 const gchar *value; | 376 gchar *value; |
| 376 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); | 377 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); |
| 377 purple_prefs_set_string(combo->key, value); | 378 purple_prefs_set_string(combo->key, value); |
| 379 g_free(value); | |
| 378 } else if (combo->type == PURPLE_PREF_BOOLEAN) { | 380 } else if (combo->type == PURPLE_PREF_BOOLEAN) { |
| 379 gboolean value; | 381 gboolean value; |
| 380 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); | 382 gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, &value, -1); |
| 381 purple_prefs_set_bool(combo->key, value); | 383 purple_prefs_set_bool(combo->key, value); |
| 382 } else { | 384 } else { |
| 418 active = iter; | 420 active = iter; |
| 419 break; | 421 break; |
| 420 } | 422 } |
| 421 | 423 |
| 422 } else if (combo->type == PURPLE_PREF_STRING) { | 424 } else if (combo->type == PURPLE_PREF_STRING) { |
| 423 const gchar *value = NULL; | 425 gchar *value = NULL; |
| 424 gtk_tree_model_get(store, &iter, PREF_DROPDOWN_VALUE, &value, -1); | 426 gtk_tree_model_get(store, &iter, PREF_DROPDOWN_VALUE, &value, -1); |
| 425 if (purple_strequal(pref_str_value, value)) { | 427 if (purple_strequal(pref_str_value, value)) { |
| 426 active = iter; | 428 active = iter; |
| 429 g_free(value); | |
| 427 break; | 430 break; |
| 428 } | 431 } |
| 432 g_free(value); | |
| 429 | 433 |
| 430 } else if (combo->type == PURPLE_PREF_BOOLEAN) { | 434 } else if (combo->type == PURPLE_PREF_BOOLEAN) { |
| 431 gboolean value = FALSE; | 435 gboolean value = FALSE; |
| 432 gtk_tree_model_get(store, &iter, PREF_DROPDOWN_VALUE, &value, -1); | 436 gtk_tree_model_get(store, &iter, PREF_DROPDOWN_VALUE, &value, -1); |
| 433 if (pref_bool_value == value) { | 437 if (pref_bool_value == value) { |
