Mercurial > pidgin
comparison src/aim.c @ 1320:7ddf58e6c1d1
[gaim-migrate @ 1330]
this only broke a half-dozen things
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Wed, 20 Dec 2000 02:18:58 +0000 |
parents | 18c3874ea051 |
children | 3d82e8f8b786 |
comparison
equal
deleted
inserted
replaced
1319:ff50d396c2bc | 1320:7ddf58e6c1d1 |
---|---|
609 g_free(opt_login_arg); | 609 g_free(opt_login_arg); |
610 opt_login_arg = NULL; | 610 opt_login_arg = NULL; |
611 } | 611 } |
612 } | 612 } |
613 | 613 |
614 if (!opt_acct) | |
615 auto_login(); | |
616 | |
614 #ifdef USE_APPLET | 617 #ifdef USE_APPLET |
615 applet_widget_register_callback(APPLET_WIDGET(applet), | 618 applet_widget_register_callback(APPLET_WIDGET(applet), |
616 "prefs", _("Preferences"), show_prefs, NULL); | 619 "prefs", _("Preferences"), show_prefs, NULL); |
617 applet_widget_register_callback(APPLET_WIDGET(applet), | 620 applet_widget_register_callback(APPLET_WIDGET(applet), |
618 "accounts", | 621 "accounts", |
630 if (opt_acct) { | 633 if (opt_acct) { |
631 account_editor(NULL, NULL); | 634 account_editor(NULL, NULL); |
632 } else if (do_login_ret == -1) | 635 } else if (do_login_ret == -1) |
633 show_login(); | 636 show_login(); |
634 | 637 |
635 if (!opt_acct) | |
636 auto_login(); | |
637 | |
638 gtk_main(); | 638 gtk_main(); |
639 | 639 |
640 #endif /* USE_APPLET */ | 640 #endif /* USE_APPLET */ |
641 | 641 |
642 gtkspell_stop(); | 642 gtkspell_stop(); |