diff src/aim.c @ 2313:bd9d403fb15b

[gaim-migrate @ 2323] more room committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 20 Sep 2001 01:23:04 +0000
parents 64dd9e99884c
children a6d0edc31554
line wrap: on
line diff
--- a/src/aim.c	Wed Sep 19 20:38:07 2001 +0000
+++ b/src/aim.c	Thu Sep 20 01:23:04 2001 +0000
@@ -297,7 +297,7 @@
 #endif
 	signon = gtk_button_new_with_label(_("Signon"));
 
-	if (display_options & OPT_DISP_COOL_LOOK) {
+	if (misc_options & OPT_MISC_COOL_LOOK) {
 		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
 #ifndef NO_MULTI
 		gtk_button_set_relief(GTK_BUTTON(accts), GTK_RELIEF_NONE);
@@ -332,7 +332,7 @@
 #ifdef GAIM_PLUGINS
 	plugs = gtk_button_new_with_label(_("Plugins"));
 #endif
-	if (display_options & OPT_DISP_COOL_LOOK) {
+	if (misc_options & OPT_MISC_COOL_LOOK) {
 		gtk_button_set_relief(GTK_BUTTON(help), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(options), GTK_RELIEF_NONE);
 #ifdef GAIM_PLUGINS
@@ -373,8 +373,6 @@
 	gtk_widget_show(mainwindow);
 }
 
-extern void show_debug(GtkObject *);
-
 #if HAVE_SIGNAL_H
 void sighandler(int sig)
 {
@@ -596,7 +594,6 @@
 	/* show version window */
 	if (opt_version) {
 		gtk_init(&argc, &argv);
-		set_defaults(FALSE);	/* needed for open_url_nw */
 		load_prefs();
 		show_about(0, (void *)2);
 		gtk_main();
@@ -604,7 +601,6 @@
 	}
 
 
-	set_defaults(FALSE);
 	load_prefs();
 
 	/* set the default username */
@@ -616,8 +612,8 @@
 #endif /* USE_GNOME */
 	}
 
-	if (general_options & OPT_GEN_DEBUG)
-		show_debug(NULL);
+	if (misc_options & OPT_MISC_DEBUG)
+		show_debug();
 
 	gtkspell_start(NULL, ispell_cmd);
 #ifdef USE_PERL