Mercurial > pidgin.yaz
comparison pidgin/gtkaccount.c @ 15736:cf58d8ec3b0d
merge of '943e1b86728490e22c089e8aba18e950e8a726c2'
and 'ec0240858e45006ba6bc6bf78be7edaeeffa963a'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 26 Feb 2007 06:24:41 +0000 |
| parents | 72d66bc51c43 86c41495fd8f |
| children | cebfc6af3eb5 |
comparison
equal
deleted
inserted
replaced
| 15724:72d66bc51c43 | 15736:cf58d8ec3b0d |
|---|---|
| 2575 if (!g_file_test(default_avatar, G_FILE_TEST_EXISTS)) { | 2575 if (!g_file_test(default_avatar, G_FILE_TEST_EXISTS)) { |
| 2576 g_free(default_avatar); | 2576 g_free(default_avatar); |
| 2577 default_avatar = NULL; | 2577 default_avatar = NULL; |
| 2578 } | 2578 } |
| 2579 } | 2579 } |
| 2580 | 2580 |
| 2581 gaim_prefs_add_path("/gaim/gtk/accounts/buddyicon", default_avatar); | 2581 gaim_prefs_add_path("/gaim/gtk/accounts/buddyicon", default_avatar); |
| 2582 g_free(default_avatar); | |
| 2582 | 2583 |
| 2583 gaim_signal_register(pidgin_account_get_handle(), "account-modified", | 2584 gaim_signal_register(pidgin_account_get_handle(), "account-modified", |
| 2584 gaim_marshal_VOID__POINTER, NULL, 1, | 2585 gaim_marshal_VOID__POINTER, NULL, 1, |
| 2585 gaim_value_new(GAIM_TYPE_SUBTYPE, | 2586 gaim_value_new(GAIM_TYPE_SUBTYPE, |
| 2586 GAIM_SUBTYPE_ACCOUNT)); | 2587 GAIM_SUBTYPE_ACCOUNT)); |