diff src/prefs.c @ 411:a330017b3aa4

[gaim-migrate @ 421] Trying to make things compile cleanly committer: Tailor Script <[e-mail]>

--- a/src/prefs.c	Thu Jun 15 00:50:59 2000 +0000
+++ b/src/prefs.c	Thu Jun 15 05:27:25 2000 +0000
@@ -34,6 +34,7 @@
 #include <gtk/gtk.h>
 #include "gaim.h"
 #include "proxy.h"
+#include "gnome_applet_mgr.h"
 
 struct prefs_data *pd = NULL;
 struct debug_window *dw = NULL;
@@ -211,6 +212,7 @@
 	return TRUE;
 }
 
+#ifndef USE_OSCAR
 static int
 connection_key_pressed(GtkWidget *w, GdkEvent *event, void *dummy)
 {
@@ -226,6 +228,7 @@
 	save_prefs();
 	return TRUE;
 }
+#endif
 
 
 
@@ -305,8 +308,6 @@
 {
 	GtkWidget *bbox;
 	GtkWidget *vbox;
-	GtkWidget *hbox;
-        GtkWidget *hbox2;
         GtkWidget *idlebox;
         GtkWidget *idleframe;
         GtkWidget *genbox;
@@ -328,6 +329,9 @@
 #ifndef USE_OSCAR /* sorry, since we don't control the comm we can't set
 		     the connection */
         GtkWidget *connection_page;
+        GtkWidget *connectopt;
+	GtkWidget *hbox;
+        GtkWidget *hbox2;
 #endif
 #ifdef USE_APPLET
 	GtkWidget *applet_page;
@@ -335,7 +339,6 @@
 #endif
         GtkWidget *label;
         GtkWidget *browseropt;
-        GtkWidget *connectopt;
         GtkWidget *idleopt;
 	        
         GList *awy = away_messages;