Index: src/gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.155
diff -u -p -u -r1.155 gtkprefs.c
--- src/gtkprefs.c	14 May 2004 05:57:38 -0000	1.155
+++ src/gtkprefs.c	16 May 2004 00:43:01 -0000
@@ -996,8 +996,8 @@ GtkWidget *im_page() {
 
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-#if 0 /* PREFSLASH04 */
 	vbox = gaim_gtk_make_frame (ret, _("Window"));
+#if 0 /* PREFSLASH04 */
 	widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
 			"/gaim/gtk/conversations/im/button_type",
 			_("Pictures"), GAIM_BUTTON_IMAGE,
@@ -1008,10 +1008,10 @@ GtkWidget *im_page() {
 
 	gtk_size_group_add_widget(sg, widge);
 	gtk_misc_set_alignment(GTK_MISC(widge), 0, 0);
+#endif /* PREFSLASH04 */
 	gaim_gtk_prefs_checkbox(_("_Raise window on events"),
 			"/gaim/gtk/conversations/im/raise_on_events", vbox);
 	gtk_widget_show (vbox);
-#endif /* PREFSLASH04 */
 	vbox = gaim_gtk_make_frame (ret, _("Buddy Icons"));
 	gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
 			"/gaim/gtk/conversations/im/show_buddy_icons", vbox);
@@ -1038,8 +1038,8 @@ GtkWidget *chat_page() {
 	gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
 
 	sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-#if 0 /* PREFSLASH04 */
 	vbox = gaim_gtk_make_frame (ret, _("Window"));
+#if 0 /* PREFSLASH04 */
 	dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
 			"/gaim/gtk/conversations/chat/button_type",
 			_("Pictures"), GAIM_BUTTON_IMAGE,
@@ -1056,9 +1056,10 @@ GtkWidget *chat_page() {
 			"/gaim/gtk/conversations/chat/default_height", 25, 9999, sg);
 	gaim_gtk_prefs_labeled_spin_button(vbox, _("_Entry field height:"),
 			"/gaim/gtk/conversations/chat/entry_height", 25, 9999, sg);
+#endif /* PREFSLASH04 */
 	gaim_gtk_prefs_checkbox(_("_Raise window on events"),
 			"/gaim/gtk/conversations/chat/raise_on_events", vbox);
-
+#if 0 /* PREFSLASH04 */
 	vbox = gaim_gtk_make_frame (ret, _("Tab Completion"));
 	gaim_gtk_prefs_checkbox(_("_Tab-complete nicks"),
 			"/gaim/gtk/conversations/chat/tab_completion", vbox);
@@ -2750,6 +2751,11 @@ static void set_away_option(GtkWidget *w
 static void
 set_bool_pref(GtkWidget *w, const char *key)
 {
+	if (key == NULL) {
+		gaim_debug_error("prefs", "Attempt to set bool pref with NULL key\n");
+		return;
+	}
+
 	gaim_prefs_set_bool(key,
 		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)));
 }