comparison src/aim.c @ 3551:cd938f18f3f8

[gaim-migrate @ 3626] In the interest of continued progress, I pulled what's usable out of my development tree and am committing it. Here, we have gotten rid of the plugins dialog and perl menu under Tools and put them both in preferences. Perl scripts now work like plugins--you have to load them explicitly (it will probe $prefix/lib/gaim and $HOME/.gaim for them) and you can unload them (although right now, this is entirely unreliable) Oh, and I broke all your perl scripts. Sorry about that. Don't try fixing them yet, though--I'm gonna make unloading single scripts more reliable tommorow. I should also finish Phase Two tommorow as well. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Thu, 26 Sep 2002 07:37:52 +0000
parents 6c32036050cf
children 9682c0e022c6
comparison
equal deleted inserted replaced
3550:e9b2003ee562 3551:cd938f18f3f8
215 215
216 void show_login() 216 void show_login()
217 { 217 {
218 GtkWidget *signon_all; 218 GtkWidget *signon_all;
219 GtkWidget *options; 219 GtkWidget *options;
220 #ifdef GAIM_PLUGINS
221 GtkWidget *plugs; 220 GtkWidget *plugs;
222 #endif
223 #ifndef NO_MULTI 221 #ifndef NO_MULTI
224 GtkWidget *accts; 222 GtkWidget *accts;
225 #endif 223 #endif
226 GtkWidget *signon; 224 GtkWidget *signon;
227 GtkWidget *cancel; 225 GtkWidget *cancel;
338 gtk_box_pack_start(GTK_BOX(sbox), hbox, TRUE, TRUE, 0); 336 gtk_box_pack_start(GTK_BOX(sbox), hbox, TRUE, TRUE, 0);
339 gtk_widget_show(hbox); 337 gtk_widget_show(hbox);
340 338
341 reg = gtk_button_new_with_label(_("Auto-login")); 339 reg = gtk_button_new_with_label(_("Auto-login"));
342 options = gtk_button_new_with_label(_("Options")); 340 options = gtk_button_new_with_label(_("Options"));
343 #ifdef GAIM_PLUGINS 341 plugs = gtk_button_new_with_label(_("About"));
344 plugs = gtk_button_new_with_label(_("Plugins"));
345 #endif
346 if (misc_options & OPT_MISC_COOL_LOOK) { 342 if (misc_options & OPT_MISC_COOL_LOOK) {
347 gtk_button_set_relief(GTK_BUTTON(reg), GTK_RELIEF_NONE); 343 gtk_button_set_relief(GTK_BUTTON(reg), GTK_RELIEF_NONE);
348 gtk_button_set_relief(GTK_BUTTON(options), GTK_RELIEF_NONE); 344 gtk_button_set_relief(GTK_BUTTON(options), GTK_RELIEF_NONE);
349 #ifdef GAIM_PLUGINS
350 gtk_button_set_relief(GTK_BUTTON(plugs), GTK_RELIEF_NONE); 345 gtk_button_set_relief(GTK_BUTTON(plugs), GTK_RELIEF_NONE);
351 #endif
352 } 346 }
353 347
354 gtk_signal_connect(GTK_OBJECT(reg), "clicked", GTK_SIGNAL_FUNC(dologin_all), NULL); 348 gtk_signal_connect(GTK_OBJECT(reg), "clicked", GTK_SIGNAL_FUNC(dologin_all), NULL);
355 gtk_signal_connect(GTK_OBJECT(options), "clicked", GTK_SIGNAL_FUNC(show_prefs), NULL); 349 gtk_signal_connect(GTK_OBJECT(options), "clicked", GTK_SIGNAL_FUNC(show_prefs), NULL);
356 #ifdef GAIM_PLUGINS 350 gtk_signal_connect(GTK_OBJECT(plugs), "clicked", GTK_SIGNAL_FUNC(show_about), NULL);
357 gtk_signal_connect(GTK_OBJECT(plugs), "clicked", GTK_SIGNAL_FUNC(show_plugins), NULL);
358 gtk_box_pack_start(GTK_BOX(hbox), plugs, TRUE, TRUE, 0); 351 gtk_box_pack_start(GTK_BOX(hbox), plugs, TRUE, TRUE, 0);
359 #endif
360 352
361 gtk_box_pack_start(GTK_BOX(hbox), options, TRUE, TRUE, 0); 353 gtk_box_pack_start(GTK_BOX(hbox), options, TRUE, TRUE, 0);
362 gtk_box_pack_start(GTK_BOX(hbox), reg, TRUE, TRUE, 0); 354 gtk_box_pack_start(GTK_BOX(hbox), reg, TRUE, TRUE, 0);
363 355
364 gtk_widget_show(reg); 356 gtk_widget_show(reg);
365 gtk_widget_show(options); 357 gtk_widget_show(options);
366 #ifdef GAIM_PLUGINS
367 gtk_widget_show(plugs); 358 gtk_widget_show(plugs);
368 #endif
369 359
370 if (aim_users) { 360 if (aim_users) {
371 struct aim_user *c = (struct aim_user *)aim_users->data; 361 struct aim_user *c = (struct aim_user *)aim_users->data;
372 if (c->options & OPT_USR_REM_PASS) { 362 if (c->options & OPT_USR_REM_PASS) {
373 combo_changed(NULL, name); 363 combo_changed(NULL, name);
722 /* show version message */ 712 /* show version message */
723 if (opt_version) { 713 if (opt_version) {
724 printf("Gaim %s\n",VERSION); 714 printf("Gaim %s\n",VERSION);
725 return 0; 715 return 0;
726 } 716 }
727 717
718 #if GAIM_PLUGINS || USE_PERL
719 gaim_probe_plugins();
720 #endif
728 load_prefs(); 721 load_prefs();
729
730 core_main(); 722 core_main();
731 ui_main(); 723 ui_main();
732 724
733 /* set the default username */ 725 /* set the default username */
734 if (opt_user_arg != NULL) { 726 if (opt_user_arg != NULL) {
750 debug_printf("gtkspell started with aspell\n"); 742 debug_printf("gtkspell started with aspell\n");
751 } else { 743 } else {
752 debug_printf("gtkspell started with ispell\n"); 744 debug_printf("gtkspell started with ispell\n");
753 } 745 }
754 } 746 }
755 #ifdef USE_PERL 747
756 perl_autoload();
757 #endif
758 static_proto_init(); 748 static_proto_init();
759 749
760 /* deal with --login */ 750 /* deal with --login */
761 if (opt_login) { 751 if (opt_login) {
762 do_login_ret = do_auto_login(opt_login_arg); 752 do_login_ret = do_auto_login(opt_login_arg);