comparison: pidgin/gtkstatusbox.c
pidgin/gtkstatusbox.c
- branch
- cpw.qulogic.gtk3
- changeset 32409
- 8487d731f10d
- parent 32408
- 9f2580caad19
- child 32414
- 8c5d1edf9da2
equal
deleted
inserted
replaced
| 32408:9f2580caad19 | 32409:8487d731f10d |
|---|---|
| 1881 gtk_widget_show_all(status_box->vbox); | 1881 gtk_widget_show_all(status_box->vbox); |
| 1882 | 1882 |
| 1883 gtk_widget_set_parent(status_box->toggle_button, GTK_WIDGET(status_box)); | 1883 gtk_widget_set_parent(status_box->toggle_button, GTK_WIDGET(status_box)); |
| 1884 | 1884 |
| 1885 gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0); | 1885 gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0); |
| 1886 | 1886 |
| 1887 g_signal_connect(G_OBJECT(status_box), "scroll_event", G_CALLBACK(combo_box_scroll_event_cb), NULL); | 1887 g_signal_connect(G_OBJECT(status_box), "scroll_event", G_CALLBACK(combo_box_scroll_event_cb), NULL); |
| 1888 g_signal_connect(G_OBJECT(status_box->imhtml), "scroll_event", | 1888 g_signal_connect(G_OBJECT(status_box->imhtml), "scroll_event", |
| 1889 G_CALLBACK(imhtml_scroll_event_cb), status_box->imhtml); | 1889 G_CALLBACK(imhtml_scroll_event_cb), status_box->imhtml); |
| 1890 g_signal_connect(G_OBJECT(status_box->popup_window), "button_release_event", G_CALLBACK(treeview_button_release_cb), status_box); | 1890 g_signal_connect(G_OBJECT(status_box->popup_window), "button_release_event", G_CALLBACK(treeview_button_release_cb), status_box); |
| 1891 g_signal_connect(G_OBJECT(status_box->popup_window), "key_press_event", G_CALLBACK(treeview_key_press_event), status_box); | 1891 g_signal_connect(G_OBJECT(status_box->popup_window), "key_press_event", G_CALLBACK(treeview_key_press_event), status_box); |
| 2568 "focus-line-width", &focus_width, | 2568 "focus-line-width", &focus_width, |
| 2569 NULL); | 2569 NULL); |
| 2570 if (!interior_focus) | 2570 if (!interior_focus) |
| 2571 height += 2 * focus_width; | 2571 height += 2 * focus_width; |
| 2572 | 2572 |
| 2573 int mh, nh; | 2573 gtk_widget_set_size_request(status_box->vbox, -1, height + PIDGIN_HIG_BOX_SPACE); |
| 2574 gtk_widget_get_preferred_height(status_box->vbox, &mh, &nh); | |
| 2575 purple_debug_info("pidgin", "statusbox, set_size_request: %d %d\n", mh, nh); | |
| 2576 | |
| 2577 gtk_widget_set_size_request(status_box->imhtml, -1, height + PIDGIN_HIG_BOX_SPACE); | |
| 2578 } | 2574 } |
| 2579 | 2575 |
| 2580 static void remove_typing_cb(PidginStatusBox *status_box) | 2576 static void remove_typing_cb(PidginStatusBox *status_box) |
| 2581 { | 2577 { |
| 2582 if (status_box->typing == 0) | 2578 if (status_box->typing == 0) |
