Mercurial > pidgin
comparison src/main.c @ 6019:272c761c52e3
[gaim-migrate @ 6469]
So Decklin sent me a patch to fix the problem with setting profiles, and then
later that day, before I got a shot at it, KingAnt fixed it himself. But
Decklin's fix is better, so here it is, hand-merged with love. KingAnt also
points out that Decklin Foster is a cool name.
Decklin also realized (and fixed) that we were initializing static protocols
after importing prefs, causing the import to fail. Thanks, Decklin.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 05 Jul 2003 01:49:07 +0000 |
| parents | 5cd7a10c6ade |
| children | 547ba881bc7e |
comparison
equal
deleted
inserted
replaced
| 6018:d4caf585f6ff | 6019:272c761c52e3 |
|---|---|
| 836 return 0; | 836 return 0; |
| 837 } | 837 } |
| 838 | 838 |
| 839 /* This has to be done before the debug stuff. */ | 839 /* This has to be done before the debug stuff. */ |
| 840 gaim_gtk_stock_init(); | 840 gaim_gtk_stock_init(); |
| 841 | |
| 842 static_proto_init(); | |
| 841 | 843 |
| 842 gaim_prefs_init(); | 844 gaim_prefs_init(); |
| 843 gaim_gtk_prefs_init(); | 845 gaim_gtk_prefs_init(); |
| 844 | 846 |
| 845 /* This kind of has to be here.. sucks, but it's important. */ | 847 /* This kind of has to be here.. sucks, but it's important. */ |
| 919 } | 921 } |
| 920 | 922 |
| 921 if (gaim_prefs_get_bool("/gaim/gtk/debug/enabled")) | 923 if (gaim_prefs_get_bool("/gaim/gtk/debug/enabled")) |
| 922 gaim_gtk_debug_window_show(); | 924 gaim_gtk_debug_window_show(); |
| 923 | 925 |
| 924 static_proto_init(); | |
| 925 | |
| 926 /* deal with --login */ | 926 /* deal with --login */ |
| 927 if (opt_login) { | 927 if (opt_login) { |
| 928 dologin_ret = dologin_named(opt_login_arg); | 928 dologin_ret = dologin_named(opt_login_arg); |
| 929 if (opt_login_arg != NULL) { | 929 if (opt_login_arg != NULL) { |
| 930 g_free(opt_login_arg); | 930 g_free(opt_login_arg); |