cpw.qulogic.gtk3: 958d6da3: don't restrain the size of the 'welcome ...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 958d6da32ed79e2eb6edb08eb4d7f8c4c0211375
Parent:   40c0713acbaeb5dde8d17c0d154606050d5f4bd3
Author:   malu at pidgin.im
Date:     12/01/10 04:41:56
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/958d6da32ed79e2eb6edb08eb4d7f8c4c0211375

Changelog: 

don't restrain the size of the 'welcome to pidgin' widget, as this makes the blist un-resizable to a smaller width, as far as I can tell stuff works as it should still...

Changes against parent 40c0713acbaeb5dde8d17c0d154606050d5f4bd3

  patched  pidgin/gtkblist.c
  patched  pidgin/gtkstatusbox.c

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	f807af4c5742ed53211f26a0e02aa49fe4fe7ef5
+++ pidgin/gtkblist.c	5a7a4a106bb463a0e2a9b1ec4cabc87b41b82cb3
@@ -6067,7 +6067,6 @@ static void pidgin_blist_show(PurpleBudd
 	pretty = pidgin_make_pretty_arrows(tmp);
 	g_free(tmp);
 	label = gtk_label_new(NULL);
-	gtk_widget_set_size_request(label, purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width") - 12, -1);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.2);
 	gtk_label_set_markup(GTK_LABEL(label), pretty);
============================================================
--- pidgin/gtkstatusbox.c	f44313f719ab66915da650c1b822606923b23a20
+++ pidgin/gtkstatusbox.c	7c79dc5c639d226ff2873a5f3c9a1357870ad36c
@@ -1883,7 +1883,7 @@ pidgin_status_box_init (PidginStatusBox 
 	gtk_widget_set_parent(status_box->toggle_button, GTK_WIDGET(status_box));
 
 	gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0);
-
+	
 	g_signal_connect(G_OBJECT(status_box), "scroll_event", G_CALLBACK(combo_box_scroll_event_cb), NULL);
 	g_signal_connect(G_OBJECT(status_box->imhtml), "scroll_event",
 					G_CALLBACK(imhtml_scroll_event_cb), status_box->imhtml);
@@ -2570,7 +2570,11 @@ static void update_size(PidginStatusBox 
 	if (!interior_focus)
 		height += 2 * focus_width;
 
-	gtk_widget_set_size_request(status_box->vbox, -1, height + PIDGIN_HIG_BOX_SPACE);
+	int mh, nh;
+	gtk_widget_get_preferred_height(status_box->vbox, &mh, &nh);
+	purple_debug_info("pidgin", "statusbox, set_size_request: %d %d\n", mh, nh);
+
+	gtk_widget_set_size_request(status_box->imhtml, -1, height + PIDGIN_HIG_BOX_SPACE);
 }
 
 static void remove_typing_cb(PidginStatusBox *status_box)