diff -r bf6111db26df -r b6c76bcadbe8 pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Fri Jun 15 04:08:46 2012 -0400 +++ b/pidgin/gtkstatusbox.c Mon Jun 25 01:06:12 2012 -0400 @@ -1942,14 +1942,16 @@ *natural_height = MAX(*natural_height, 34) + border_width * 2; /* If the gtkimhtml is visible, then add some additional padding */ - gtk_widget_get_preferred_height(PIDGIN_STATUS_BOX(widget)->vbox, - &box_min_height, &box_nat_height); - - if (box_min_height > 1) - *minimum_height += box_min_height + border_width * 2; - - if (box_nat_height > 1) - *natural_height += box_nat_height + border_width * 2; + if (PIDGIN_STATUS_BOX(widget)->imhtml_visible) { + gtk_widget_get_preferred_height(PIDGIN_STATUS_BOX(widget)->vbox, + &box_min_height, &box_nat_height); + + if (box_min_height > 1) + *minimum_height += box_min_height + border_width * 2; + + if (box_nat_height > 1) + *natural_height += box_nat_height + border_width * 2; + } } /* From gnome-panel */ @@ -2039,8 +2041,6 @@ } gtk_widget_size_allocate(status_box->toggle_button, &parent_alc); gtk_widget_set_allocation(GTK_WIDGET(status_box), allocation); - purple_debug_info("pidgin", "statusbox allocation: width = %d, height = %d\n", - allocation->width, allocation->height); } static gboolean