diff src/gtkprefs.c @ 9251:45d2ad4ac1c1

[gaim-migrate @ 10050] Stu Tomlinson has provided a nice patch to move the separation of IM and Chat windows back into the core from the extplacement plugin. It's awesome to have crazy patch writers, and even better to have crazy patch writers who write what I want to write before I do it, thus saving me the effort. committer: Tailor Script <[e-mail]>

--- a/src/gtkprefs.c	Wed Jun 09 18:58:26 2004 +0000
+++ b/src/gtkprefs.c	Wed Jun 09 20:47:07 2004 +0000
@@ -1005,11 +1005,6 @@
 	if (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs"))
 		gtk_widget_set_sensitive(vbox2, FALSE);
 
-#if 0 /* PREFSLASH04 */
-	gaim_gtk_prefs_checkbox(_("Show IMs and chats in _same tabbed window"),
-							"/core/conversations/combine_chat_im", vbox2);
-#endif
-
 	gaim_gtk_prefs_checkbox(_("Show _close button on tabs"),
 							"/gaim/gtk/conversations/close_on_tabs", vbox2);
 
@@ -1024,18 +1019,12 @@
 	gtk_size_group_add_widget(sg, label);
 
 	names = gaim_conv_placement_get_options();
-	label = gaim_gtk_prefs_dropdown_from_list(vbox2, _("New window _placement:"),
+	label = gaim_gtk_prefs_dropdown_from_list(vbox2, _("New conversation _placement:"),
 			GAIM_PREF_STRING, "/gaim/gtk/conversations/placement", names);
 	gtk_size_group_add_widget(sg, label);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	g_list_free(names);
 
-#if 0 /* PREFSLASH04 */
- 	label = gaim_gtk_prefs_labeled_spin_button(vbox2, _("Number of conversations per window:"),
-	                                           "/gaim/gtk/conversations/placement_number",
-	                                           1, 50, sg);
-#endif
-
 	gtk_widget_show_all(ret);
 
 	return ret;