summaryrefslogtreecommitdiff
path: root/pidgin/gtkconv.c
diff options
context:
space:
mode:
Diffstat (limited to 'pidgin/gtkconv.c')
-rw-r--r--pidgin/gtkconv.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 4a8c3d9690..c07f3ea4d6 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -4207,6 +4207,9 @@ setup_chat_pane(PidginConversation *gtkconv)
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);
@@ -4383,6 +4386,9 @@ setup_im_pane(PidginConversation *gtkconv)
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);
@@ -8040,9 +8046,8 @@ pidgin_conv_window_new()
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_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"));
+ GTK_WINDOW(win->window)->allow_shrink = TRUE;
+
if (available_list == NULL) {
create_icon_lists(win->window);
}