diff src/aim.c @ 423:0d4e80bdb96b

[gaim-migrate @ 433] No more --enable-oscar option. From now on, it's a toggle in the preferences. PLEASE DO NOT USE OSCAR, even though it's very easy to. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Wed, 21 Jun 2000 19:33:58 +0000
parents 9e8c02ed5d06
children 0cd2ba801eb4
line wrap: on
line diff
--- a/src/aim.c	Mon Jun 19 21:58:32 2000 +0000
+++ b/src/aim.c	Wed Jun 21 19:33:58 2000 +0000
@@ -202,7 +202,9 @@
 		running = FALSE;
                 return;
 	}
-#ifdef USE_OSCAR
+
+	if (!USE_OSCAR) /* serv_login will set up USE_OSCAR */
+		gaim_setup();
 }
 
 void auth_failed() {
@@ -213,7 +215,6 @@
  * process, it doesn't end there. gaim_setup will be called later from
  * oscar.c, after the buddy list is made and serv_finish_login is called */
 void gaim_setup() {
-#endif /* USE_OSCAR */
 	if (sound_options & OPT_SOUND_LOGIN &&
 		sound_options & OPT_SOUND_SILENT_SIGNON) {
 		logins_not_muted = 0;
@@ -461,7 +462,7 @@
 
 
         gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(remember), (general_options & OPT_GEN_REMEMBER_PASS));
-        
+
 	if (current_user) {
 		GList *all = aim_users;
 		GList *srch = g_list_find(all, (void *)current_user);