Mercurial > pidgin.yaz
changeset 5683:9befba33f7c8
[gaim-migrate @ 6102]
Moved the call to gtk_proxy_init() into main.c for now.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Tue, 03 Jun 2003 02:30:30 +0000 |
| parents | cec7988f8ee7 |
| children | b61520e71679 |
| files | src/main.c src/prefs.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c Tue Jun 03 02:04:29 2003 +0000 +++ b/src/main.c Tue Jun 03 02:30:30 2003 +0000 @@ -885,8 +885,9 @@ gaim_set_request_ui_ops(gaim_get_gtk_request_ui_ops()); gaim_prefs_init(); + gaim_proxy_init(); + gaim_gtk_prefs_init(); - gaim_gtk_conversation_init(); plugin_search_paths[0] = LIBDIR; @@ -906,6 +907,7 @@ gaim_prefs_sync(); } + /* This kind of has to be here.. sucks, but it's important. */ gaim_gtk_debug_init(); gaim_accounts_load();
--- a/src/prefs.c Tue Jun 03 02:04:29 2003 +0000 +++ b/src/prefs.c Tue Jun 03 02:30:30 2003 +0000 @@ -146,8 +146,6 @@ gaim_prefs_add_bool("/core/sound/use_custom", FALSE); gaim_prefs_add_string("/core/sound/command", ""); gaim_prefs_add_bool("/core/sound/while_away", FALSE); - - gaim_proxy_init(); } static char *pref_full_name(struct gaim_pref *pref) {