pidgin: 751ab939: Prevent an infinite loop from the prefer...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 751ab93934a0cb16378fb81c8b62d0183ce7e299
Ancestor: 2980a8828dae367476dcf5d8e52783fdc137d8bf
Author: sadrul at pidgin.im
Date: 2009-11-20T05:09:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/751ab93934a0cb16378fb81c8b62d0183ce7e299

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

Prevent an infinite loop from the preference window.

If the preference window doesn't get the window-size it requested, it
goes into an infinite loop. This is caused by the imhtml widget in the
conversations page, and happens when the window-manager gives it a really
small size such that the imhtml widget doesn't get displayed. So, instead
of making the widget change its size, keep it in a fixed size. The width
of the preference pages are now dictated mostly by the network, status
and themes pages. So extending the fixed width of the imhtml widget in
the conversation page should not cause too many problems.

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	bbcb8dd6ae9183d15be3c22f51cc89c09d1175a7
+++ pidgin/gtkprefs.c	16ed7de73877df0e3f88331893ac16889f7f6e3c
@@ -1510,12 +1510,11 @@ conv_page(void)
 #endif
 
 	vbox = pidgin_make_frame(ret, _("Default Formatting"));
-	gtk_box_set_child_packing(GTK_BOX(vbox->parent), vbox, TRUE, TRUE, 0, GTK_PACK_START);
 
 	frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
 	gtk_widget_show(frame);
 	gtk_widget_set_name(imhtml, "pidgin_prefs_font_imhtml");
-	gtk_widget_set_size_request(frame, 300, -1);
+	gtk_widget_set_size_request(frame, 450, -1);
 	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml),
 									GTK_IMHTML_BOLD |