diff -r 211cd8a67896 -r 6e8f285962e7 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Wed May 23 23:21:48 2007 +0000 +++ b/pidgin/gtkconv.c Thu May 24 00:35:15 2007 +0000 @@ -4207,9 +4207,6 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), imhtml_sw_hscroll, GTK_POLICY_ALWAYS); - gtk_widget_set_size_request(gtkconv->imhtml, - purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_width"), - purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_height")); g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv); @@ -4386,9 +4383,6 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), imhtml_sw_hscroll, GTK_POLICY_ALWAYS); - gtk_widget_set_size_request(gtkconv->imhtml, - purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"), - purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height")); g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv); @@ -8046,8 +8040,9 @@ gtk_window_set_role(GTK_WINDOW(win->window), "conversation"); gtk_window_set_resizable(GTK_WINDOW(win->window), TRUE); gtk_container_set_border_width(GTK_CONTAINER(win->window), 0); - GTK_WINDOW(win->window)->allow_shrink = TRUE; - + gtk_window_set_default_size(win->window, + purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"), + purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height")); if (available_list == NULL) { create_icon_lists(win->window); }