changeset 9614:c35c6b56a35f

[gaim-migrate @ 10458] (22:21:59) datallah: "oops" ? committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 30 Jul 2004 02:20:49 +0000
parents 1b13160bf5a4
children 7fcf32aadbba
files src/conversation.c src/gtkconv.c
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/conversation.c	Thu Jul 29 03:11:00 2004 +0000
+++ b/src/conversation.c	Fri Jul 30 02:20:49 2004 +0000
@@ -813,10 +813,10 @@
 
 		win = gaim_conv_window_new();
 
+		gaim_conv_window_add_conversation(win, conv);
+
 		/* Ensure the window is visible. */
 		gaim_conv_window_show(win);
-
-		gaim_conv_window_add_conversation(win, conv);
 	}
 	else
 	{
@@ -2358,8 +2358,9 @@
 
 	if (win == NULL) {
 		win = gaim_conv_window_new();
+
+		gaim_conv_window_add_conversation(win, conv);
 		gaim_conv_window_show(win);
-		gaim_conv_window_add_conversation(win, conv);
 	}
 	else
 		gaim_conv_window_add_conversation(win, conv);
@@ -2375,8 +2376,9 @@
 
 	if (win == NULL) {
 		win = gaim_conv_window_new();
+
+		gaim_conv_window_add_conversation(win, conv);
 		gaim_conv_window_show(win);
-		gaim_conv_window_add_conversation(win, conv);
 	}
 	else
 		gaim_conv_window_add_conversation(win, conv);
--- a/src/gtkconv.c	Thu Jul 29 03:11:00 2004 +0000
+++ b/src/gtkconv.c	Fri Jul 30 02:20:49 2004 +0000
@@ -4438,7 +4438,9 @@
 	/* Create the window. */
 	gtkwin->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_role(GTK_WINDOW(gtkwin->window), "conversation");
+	gtk_window_set_resizable(GTK_WINDOW(gtkwin->window), TRUE);
 	gtk_container_set_border_width(GTK_CONTAINER(gtkwin->window), 0);
+	GTK_WINDOW(gtkwin->window)->allow_shrink = TRUE;
 
 	g_signal_connect(G_OBJECT(gtkwin->window), "delete_event",
 					 G_CALLBACK(close_win_cb), win);