/pidgin/main: 707c3c2b2c8a: Fix more gtk_[hv]box_new gtk3 deprec...
Tomasz Wasilczyk
twasilczyk at pidgin.im
Mon Feb 10 21:23:45 EST 2014
Changeset: 707c3c2b2c8a7b0cbb3f0a637c972ad9138c7305
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-02-11 03:23 +0100
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/707c3c2b2c8a
Description:
Fix more gtk_[hv]box_new gtk3 deprecation warnings
diffstat:
pidgin/gtkaccount.c | 22 ++++++++--------
pidgin/gtkblist.c | 16 +++++-----
pidgin/gtkcertmgr.c | 6 ++--
pidgin/gtkconv.c | 38 ++++++++++++++--------------
pidgin/gtkdebug.c | 2 +-
pidgin/gtkdialogs.c | 2 +-
pidgin/gtklog.c | 6 ++--
pidgin/gtkmedia.c | 14 +++++-----
pidgin/gtkmenutray.c | 2 +-
pidgin/gtknotify.c | 3 +-
pidgin/gtkplugin.c | 2 +-
pidgin/gtkpluginpref.c | 8 +++--
pidgin/gtkpounce.c | 7 ++--
pidgin/gtkprefs.c | 62 +++++++++++++++++++++++----------------------
pidgin/gtkrequest.c | 38 ++++++++++++++--------------
pidgin/gtksavedstatuses.c | 6 ++--
pidgin/gtkstatusbox.c | 4 +-
pidgin/gtkutils.c | 26 +++++++++---------
pidgin/gtkwebviewtoolbar.c | 6 ++--
pidgin/gtkwhiteboard.c | 12 +++++---
pidgin/minidialog.c | 8 +++--
21 files changed, 150 insertions(+), 140 deletions(-)
diffs (truncated from 1267 to 300 lines):
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -619,7 +619,7 @@ add_login_options(AccountPrefsDialog *di
gtk_widget_show(dialog->login_frame);
/* Main vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_widget_show(vbox);
@@ -807,7 +807,7 @@ add_user_options(AccountPrefsDialog *dia
gtk_widget_show(dialog->user_frame);
/* Main vbox */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_widget_show(vbox);
@@ -827,7 +827,7 @@ add_user_options(AccountPrefsDialog *dia
gtk_widget_show(dialog->icon_check);
gtk_box_pack_start(GTK_BOX(vbox), dialog->icon_check, FALSE, FALSE, 0);
- dialog->icon_hbox = hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ dialog->icon_hbox = hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
gtk_widget_set_sensitive(hbox, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)));
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
@@ -850,11 +850,11 @@ add_user_options(AccountPrefsDialog *dia
purple_imgstore_unref(dialog->icon_img);
dialog->icon_img = NULL;
- vbox2 = gtk_vbox_new(FALSE, 0);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0);
gtk_widget_show(vbox2);
- hbox2 = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, PIDGIN_HIG_BORDER);
gtk_widget_show(hbox2);
@@ -952,7 +952,7 @@ add_protocol_options(AccountPrefsDialog
account = dialog->account;
/* Main vbox */
- dialog->protocol_frame = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ dialog->protocol_frame = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER);
gtk_notebook_insert_page(GTK_NOTEBOOK(dialog->notebook), vbox,
gtk_label_new_with_mnemonic(_("Ad_vanced")), 1);
@@ -1258,7 +1258,7 @@ add_proxy_options(AccountPrefsDialog *di
gtk_widget_destroy(dialog->proxy_frame);
/* Main vbox */
- dialog->proxy_frame = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ dialog->proxy_frame = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_container_add(GTK_CONTAINER(parent), vbox);
gtk_widget_show(vbox);
@@ -1268,7 +1268,7 @@ add_proxy_options(AccountPrefsDialog *di
add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown);
/* Setup the second vbox, which may be hidden at times. */
- dialog->proxy_vbox = vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ dialog->proxy_vbox = vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, PIDGIN_HIG_BORDER);
gtk_widget_show(vbox2);
@@ -1355,7 +1355,7 @@ add_voice_options(AccountPrefsDialog *di
}
if (!dialog->voice_frame) {
- dialog->voice_frame = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+ dialog->voice_frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
gtk_container_set_border_width(GTK_CONTAINER(dialog->voice_frame),
PIDGIN_HIG_BORDER);
@@ -1776,7 +1776,7 @@ pidgin_account_dialog_show_continue(Purp
gtk_widget_show(GTK_WIDGET(notebook));
/* Setup the inner vbox */
- dialog->top_vbox = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+ dialog->top_vbox = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
gtk_label_new_with_mnemonic(_("_Basic")));
@@ -1802,7 +1802,7 @@ pidgin_account_dialog_show_continue(Purp
add_protocol_options(dialog);
/* Setup the page with 'Proxy'. */
- dbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+ dbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BORDER);
gtk_container_set_border_width(GTK_CONTAINER(dbox), PIDGIN_HIG_BORDER);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox,
gtk_label_new_with_mnemonic(_("P_roxy")));
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -998,13 +998,13 @@ make_blist_request_dialog(PidginBlistReq
PIDGIN_HIG_BOX_SPACE);
gtk_window_set_role(GTK_WINDOW(data->window), window_role);
- hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(data->window))),
hbox);
gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add(GTK_CONTAINER(hbox), vbox);
label = gtk_label_new(label_text);
@@ -1020,7 +1020,7 @@ make_blist_request_dialog(PidginBlistReq
callback_func, filter_func, data);
pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("A_ccount"), data->sg, data->account_menu, TRUE, NULL);
- data->vbox = GTK_BOX(gtk_vbox_new(FALSE, 5));
+ data->vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 5));
gtk_container_set_border_width(GTK_CONTAINER(data->vbox), 0);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(data->vbox), FALSE, FALSE, 0);
@@ -5423,7 +5423,7 @@ create_account_label(PurpleAccount *acco
char *markup;
char *description;
- hbox = gtk_hbox_new(FALSE, 6);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
g_object_set_data(G_OBJECT(hbox), OBJECT_DATA_KEY_ACCOUNT, account);
pack_prpl_icon_start(hbox, account);
@@ -5650,7 +5650,7 @@ blist_focus_cb(GtkWidget *widget, GdkEve
static GtkWidget *
kiosk_page()
{
- GtkWidget *ret = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ GtkWidget *ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
GtkWidget *label;
GtkWidget *entry;
GtkWidget *bbox;
@@ -5912,7 +5912,7 @@ static void pidgin_blist_show(PurpleBudd
GTK_WINDOW(gtkblist->window)->allow_shrink = TRUE;
#endif
- gtkblist->main_vbox = gtk_vbox_new(FALSE, 0);
+ gtkblist->main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(gtkblist->main_vbox);
gtk_container_add(GTK_CONTAINER(gtkblist->window), gtkblist->main_vbox);
@@ -5988,7 +5988,7 @@ static void pidgin_blist_show(PurpleBudd
gtk_label_set_markup(GTK_LABEL(label), pretty);
g_free(pretty);
gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook),label, NULL);
- gtkblist->vbox = gtk_vbox_new(FALSE, 0);
+ gtkblist->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook), gtkblist->vbox, NULL);
gtk_widget_show_all(gtkblist->notebook);
pidgin_blist_select_notebook_page(gtkblist);
@@ -6033,7 +6033,7 @@ static void pidgin_blist_show(PurpleBudd
ebox = gtk_event_box_new();
gtk_box_pack_start(GTK_BOX(gtkblist->vbox), ebox, FALSE, FALSE, 0);
- gtkblist->headline = gtk_hbox_new(FALSE, 3);
+ gtkblist->headline = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
gtk_container_set_border_width(GTK_CONTAINER(gtkblist->headline), 6);
gtk_container_add(GTK_CONTAINER(ebox), gtkblist->headline);
gtkblist->headline_image = gtk_image_new_from_pixbuf(NULL);
diff --git a/pidgin/gtkcertmgr.c b/pidgin/gtkcertmgr.c
--- a/pidgin/gtkcertmgr.c
+++ b/pidgin/gtkcertmgr.c
@@ -30,6 +30,7 @@
#include "notify.h"
#include "request.h"
+#include "gtk3compat.h"
#include "gtkblist.h"
#include "gtkutils.h"
@@ -410,9 +411,8 @@ tls_peers_mgmt_build(void)
/* Create a struct to store context information about this window */
tpm_dat = g_new0(tls_peers_mgmt_data, 1);
- tpm_dat->mgmt_widget = mgmt_widget =
- gtk_hbox_new(FALSE, /* Non-homogeneous */
- PIDGIN_HIG_BOX_SPACE);
+ tpm_dat->mgmt_widget = mgmt_widget = gtk_box_new(
+ GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
gtk_container_set_border_width(GTK_CONTAINER(mgmt_widget),
PIDGIN_HIG_BOX_SPACE);
gtk_widget_show(mgmt_widget);
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -955,13 +955,13 @@ invite_cb(GtkWidget *widget, PidginConve
gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BOX_SPACE);
/* Setup the inner hbox and put the dialog's icon in it. */
- hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
gtk_container_add(GTK_CONTAINER(vbox), hbox);
gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
/* Setup the right vbox. */
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(hbox), vbox);
/* Put our happy label in it. */
@@ -974,7 +974,7 @@ invite_cb(GtkWidget *widget, PidginConve
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
/* hbox for the table, and to give it some spacing on the left. */
- hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
gtk_container_add(GTK_CONTAINER(vbox), hbox);
/* Setup the table we're going to use to lay stuff out. */
@@ -4008,7 +4008,7 @@ create_sendto_item(GtkWidget *menu, GtkS
*group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
/* Do some evil, see some evil, speak some evil. */
- box = gtk_hbox_new(FALSE, 0);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_bin_get_child(GTK_BIN(menuitem));
g_object_ref(label);
@@ -5048,7 +5048,7 @@ setup_chat_topic(PidginConversation *gtk
GtkWidget *hbox, *label;
PidginChatPane *gtkchat = gtkconv->u.chat;
- hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new(_("Topic:"));
@@ -5113,7 +5113,7 @@ setup_chat_userlist(PidginConversation *
PurpleConversation *conv = gtkconv->active_conv;
/* Build the right pane. */
- lbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ lbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_paned_pack2(GTK_PANED(hpaned), lbox, FALSE, TRUE);
gtk_widget_show(lbox);
@@ -5280,7 +5280,7 @@ quickfind_process_input(GtkWidget *entry
static void
pidgin_conv_setup_quickfind(PidginConversation *gtkconv, GtkWidget *container)
{
- GtkWidget *widget = gtk_hbox_new(FALSE, 0);
+ GtkWidget *widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *label, *entry, *close;
#if GTK_CHECK_VERSION(3,0,0)
GtkStyleContext *context;
@@ -5572,14 +5572,14 @@ setup_common_pane(PidginConversation *gt
int buddyicon_size = 0;
/* Setup the top part of the pane */
- vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);
gtk_widget_show(vbox);
/* Setup the info pane */
event_box = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box), FALSE);
gtk_widget_show(event_box);
- gtkconv->infopane_hbox = gtk_hbox_new(FALSE, 0);
+ gtkconv->infopane_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), event_box, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(event_box), gtkconv->infopane_hbox);
gtk_widget_show(gtkconv->infopane_hbox);
@@ -5609,13 +5609,13 @@ setup_common_pane(PidginConversation *gt
for both the buddy list and the chat window, but PidginConversation
is pretty much stuck until 3.0. */
GtkWidget *sizing_vbox;
- sizing_vbox = gtk_vbox_new(FALSE, 0);
+ sizing_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_size_request(sizing_vbox, -1, BUDDYICON_SIZE_MIN);
gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox), sizing_vbox, FALSE, FALSE, 0);
gtk_widget_show(sizing_vbox);
}
else {
- gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0);
+ gtkconv->u.im->icon_container = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
if ((buddy = purple_blist_find_buddy(purple_conversation_get_account(conv),
purple_conversation_get_name(conv))) != NULL) {
@@ -5696,7 +5696,7 @@ setup_common_pane(PidginConversation *gt
pidgin_conv_setup_quickfind(gtkconv, vbox);
- gtkconv->lower_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+ gtkconv->lower_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
gtk_box_pack_start(GTK_BOX(vbox), gtkconv->lower_hbox, FALSE, FALSE, 0);
gtk_widget_show(gtkconv->lower_hbox);
More information about the Commits
mailing list