Mercurial > pidgin.yaz

changeset 4851:4b6bf5ed9c5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 5178] bug fixen and such. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sat, 22 Mar 2003 01:26:07 +0000
parents b5508e864987
children d1c17e81055e
files src/gtkconv.c
diffstat 1 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Fri Mar 21 21:48:13 2003 +0000
+++ b/src/gtkconv.c	Sat Mar 22 01:26:07 2003 +0000
@@ -3082,7 +3082,7 @@
 	gtkconv->entry = gtk_text_view_new_with_buffer(gtkconv->entry_buffer);
 
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD);
-	gtk_widget_set_size_request(gtkconv->entry, buddy_chat_size.width,
+	gtk_widget_set_size_request(gtkconv->entry, -1,
 								MAX(buddy_chat_size.entry_height, 25));
 
 	/* Connect the signal handlers. */
@@ -3141,6 +3141,7 @@
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(gtkconv->sw),
 										GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(vbox), gtkconv->sw, TRUE, TRUE, 0);
+
 	gtk_widget_set_size_request(gtkconv->sw, conv_size.width, conv_size.height);
 	gtk_widget_show(gtkconv->sw);
 
@@ -3177,7 +3178,7 @@
 	gtkconv->entry = gtk_text_view_new_with_buffer(gtkconv->entry_buffer);
 
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD);
-	gtk_widget_set_size_request(gtkconv->entry, conv_size.width - 20,
+	gtk_widget_set_size_request(gtkconv->entry, -1,
 								MAX(conv_size.entry_height, 25));
 
 	/* Connect the signal handlers. */
@@ -3591,9 +3592,14 @@
 	if (gaim_window_get_conversation_count(win) == 1) {
 		/* Er, bug in notebooks? Switch to the page manually. */
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkwin->notebook), 0);
-		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gtkwin->notebook),
-				((conv_type == GAIM_CONV_IM && im_options & OPT_IM_ONE_WINDOW) ||
-				(conv_type == GAIM_CONV_CHAT && im_options & OPT_CHAT_ONE_WINDOW)));
+
+		if(conv_type == GAIM_CONV_IM) {
+			gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gtkwin->notebook),
+					(im_options & OPT_IM_ONE_WINDOW));
+		} else if(conv_type == GAIM_CONV_CHAT) {
+			gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gtkwin->notebook),
+					(chat_options & OPT_CHAT_ONE_WINDOW));
+		}
 	} else {
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gtkwin->notebook), TRUE);
 	}