pidgin/pidgin

02b5a573215c
Parents 3a6156743d75
Children 0fcbcc3b45eb
Fix a glib warning about bad gtk_widget_set_size_request call
--- a/pidgin/gtkblist.c Mon Mar 17 10:19:56 2014 +0100
+++ b/pidgin/gtkblist.c Mon Mar 17 10:41:24 2014 +0100
@@ -5921,6 +5921,7 @@
GError *error;
GtkAccelGroup *accel_group;
GtkTreeSelection *selection;
+ int blist_width;
GtkTargetEntry dte[] = {{"PURPLE_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
{"application/x-im-contact", 0, DRAG_BUDDY},
{"text/x-vcard", 0, DRAG_VCARD },
@@ -6087,8 +6088,10 @@
gtkblist->headline_image = gtk_image_new_from_pixbuf(NULL);
gtk_misc_set_alignment(GTK_MISC(gtkblist->headline_image), 0.0, 0);
gtkblist->headline_label = gtk_label_new(NULL);
- gtk_widget_set_size_request(gtkblist->headline_label,
- purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25,-1);
+ blist_width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width") - 25;
+ if (blist_width < -1)
+ blist_width = -1;
+ gtk_widget_set_size_request(gtkblist->headline_label, blist_width, -1);
gtk_label_set_line_wrap(GTK_LABEL(gtkblist->headline_label), TRUE);
gtk_box_pack_start(GTK_BOX(gtkblist->headline), gtkblist->headline_image, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(gtkblist->headline), gtkblist->headline_label, TRUE, TRUE, 0);