pidgin/ljfisher-ssl-client-auth

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...
cpw.qulogic.gtk3
2010-12-01, Marcus Lundblad
9f2580caad19
Parents 683883fbfcd3
Children 8487d731f10d
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...
2 files changed, 6 insertions(+), 3 deletions(-)
  • +0 -1
    pidgin/gtkblist.c
  • +6 -2
    pidgin/gtkstatusbox.c
    • --- a/pidgin/gtkblist.c Tue Nov 30 09:03:34 2010 +0000
    +++ b/pidgin/gtkblist.c Wed Dec 01 09:41:56 2010 +0000
    @@ -6067,7 +6067,6 @@
    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);
    --- a/pidgin/gtkstatusbox.c Tue Nov 30 09:03:34 2010 +0000
    +++ b/pidgin/gtkstatusbox.c Wed Dec 01 09:41:56 2010 +0000
    @@ -1883,7 +1883,7 @@
    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 @@
    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)