# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1083887812 0
# Node ID 8ffd1679df9344bb045fcff52fd6804db8d5a8de
# Parent  136b4e159d0487fe17746f8ae774c1022b8ab976
[gaim-migrate @ 9666]
Remove New window width, new window heigh, entry field height
and hide on send.

The width and height prefs still need to update themselves
when the conversation window is resized.  Any volunteers?

committer: Tailor Script <tailor@pidgin.im>

diff -r 136b4e159d04 -r 8ffd1679df93 src/gaimrc.c
--- a/src/gaimrc.c	Thu May 06 22:38:01 2004 +0000
+++ b/src/gaimrc.c	Thu May 06 23:56:52 2004 +0000
@@ -1036,8 +1036,6 @@
 					!(im_options & OPT_IM_NO_ANIMATION));
 			gaim_prefs_set_bool("/core/conversations/use_alias_for_title",
 					im_options & OPT_IM_ALIAS_TAB);
-			gaim_prefs_set_bool("/gaim/gtk/conversations/im/hide_on_send",
-								(im_options & OPT_IM_POPDOWN));
 			gaim_prefs_set_bool("/gaim/gtk/conversations/tabs",
 					im_options & OPT_IM_ONE_WINDOW);
 
diff -r 136b4e159d04 -r 8ffd1679df93 src/gtkconv.c
--- a/src/gtkconv.c	Thu May 06 22:38:01 2004 +0000
+++ b/src/gtkconv.c	Thu May 06 23:56:52 2004 +0000
@@ -328,9 +328,6 @@
 			gaim_conv_chat_send(GAIM_CONV_CHAT(conv), buf);
 	}
 
-	if (gaim_prefs_get_bool("/gaim/gtk/conversations/im/hide_on_send"))
-		gaim_conv_window_hide(gaim_conversation_get_window(conv));
-
 	g_free(clean);
 	g_free(buf);
 
@@ -3798,6 +3795,7 @@
 										GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(vbox), gtkconv->sw, TRUE, TRUE, 0);
 
+	/* XXX - The following two prefs need to be set whenever the window is resized. */
 	gtk_widget_set_size_request(gtkconv->sw,
 			gaim_prefs_get_int("/gaim/gtk/conversations/im/default_width"),
 			gaim_prefs_get_int("/gaim/gtk/conversations/im/default_height"));
@@ -3862,6 +3860,7 @@
 	gtk_imhtml_set_editable(GTK_IMHTML(gtkconv->entry), TRUE);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry),
 								GTK_WRAP_WORD_CHAR);
+	/* XXX - The following pref needs to be set whenever the window is resized. */
 	gtk_widget_set_size_request(gtkconv->entry, -1,
 			gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height"));
 	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
@@ -4555,8 +4554,7 @@
 	    ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
 	      gaim_prefs_get_bool("/gaim/gtk/conversations/chat/raise_on_events")) ||
 	     (gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
-	      (gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events") ||
-	       gaim_prefs_get_bool("/gaim/gtk/conversations/im/hide_on_send"))))) {
+	      gaim_prefs_get_bool("/gaim/gtk/conversations/im/raise_on_events")))) {
 
 		gaim_conv_window_show(win);
 	}
@@ -5885,7 +5883,6 @@
 	gaim_prefs_add_int("/gaim/gtk/conversations/im/button_type",
 					   GAIM_BUTTON_TEXT_IMAGE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/im/animate_buddy_icons", TRUE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/im/hide_on_send", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/im/raise_on_events", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/im/show_buddy_icons", TRUE);
 	gaim_prefs_add_int("/gaim/gtk/conversations/im/default_width", 410);
diff -r 136b4e159d04 -r 8ffd1679df93 src/gtkprefs.c
--- a/src/gtkprefs.c	Thu May 06 22:38:01 2004 +0000
+++ b/src/gtkprefs.c	Thu May 06 23:56:52 2004 +0000
@@ -973,16 +973,8 @@
 
 	gtk_size_group_add_widget(sg, widge);
 	gtk_misc_set_alignment(GTK_MISC(widge), 0, 0);
-	gaim_gtk_prefs_labeled_spin_button(vbox, _("New window _width:"),
-			"/gaim/gtk/conversations/im/default_width", 25, 9999, sg);
-	gaim_gtk_prefs_labeled_spin_button(vbox, _("New window _height:"),
-			"/gaim/gtk/conversations/im/default_height", 25, 9999, sg);
-	gaim_gtk_prefs_labeled_spin_button(vbox, _("_Entry field height:"),
-			"/gaim/gtk/conversations/im/entry_height", 25, 9999, sg);
 	gaim_gtk_prefs_checkbox(_("_Raise window on events"),
 			"/gaim/gtk/conversations/im/raise_on_events", vbox);
-	gaim_gtk_prefs_checkbox(_("Hide window on _send"),
-			"/gaim/gtk/conversations/im/hide_on_send", vbox);
 	gtk_widget_show (vbox);
 #endif /* PREFSLASH04 */
 	vbox = gaim_gtk_make_frame (ret, _("Buddy Icons"));