Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 17260:baaf2cf9339c
disapproval of revision '1f819f5ad330efa81ac7906f854b46f0c8bbd7b6'
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Thu, 24 May 2007 23:37:05 +0000 |
| parents | 9c7abb947af4 |
| children | 1c62deca5958 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Thu May 24 00:35:15 2007 +0000 +++ b/pidgin/gtkconv.c Thu May 24 23:37:05 2007 +0000 @@ -4207,6 +4207,9 @@ 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 @@ 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 @@ 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); }