From 8e2902eefc466c662bd7bef0533de05db0897c49 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 19 Jan 2013 18:42:33 -0500 Subject: Bump GDK_VERSION_MIN_REQUIRED to GDK_VERSION_3_2. Clean up resulting deprecation warnings, which were all related to GtkOrientable consolidation (e.g. gtk_hbox_new() -> gtk_box_new()). --- mail/e-mail-account-manager.c | 2 +- mail/e-mail-browser.c | 2 +- mail/e-mail-config-provider-page.c | 6 +++--- mail/e-mail-label-action.c | 2 +- mail/e-mail-label-dialog.c | 2 +- mail/e-mail-label-manager.c | 2 +- mail/e-mail-notebook-view.c | 2 +- mail/em-filter-rule.c | 2 +- mail/em-folder-selection-button.c | 2 +- mail/em-folder-selector.c | 2 +- mail/em-subscription-editor.c | 4 ++-- mail/importers/elm-importer.c | 2 +- mail/importers/evolution-mbox-importer.c | 4 ++-- mail/importers/pine-importer.c | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c index 17815202d7..8acb62d902 100644 --- a/mail/e-mail-account-manager.c +++ b/mail/e-mail-account-manager.c @@ -477,7 +477,7 @@ mail_account_manager_constructed (GObject *object) container = GTK_WIDGET (manager); - widget = gtk_vbutton_box_new (); + widget = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); gtk_button_box_set_layout ( GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START); gtk_box_set_spacing (GTK_BOX (widget), 6); diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 495bf64895..400d97f3b6 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -647,7 +647,7 @@ mail_browser_constructed (GObject *object) /* Construct window widgets. */ - widget = gtk_vbox_new (FALSE, 0); + widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (object), widget); gtk_widget_show (widget); diff --git a/mail/e-mail-config-provider-page.c b/mail/e-mail-config-provider-page.c index ebce5d102a..81264babc6 100644 --- a/mail/e-mail-config-provider-page.c +++ b/mail/e-mail-config-provider-page.c @@ -268,7 +268,7 @@ mail_config_provider_page_add_checkspin (EMailConfigProviderPage *page, post += 2; } - hbox = gtk_hbox_new (FALSE, 3); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_widget_set_margin_left (hbox, STANDARD_MARGIN); gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -328,7 +328,7 @@ mail_config_provider_page_add_entry (EMailConfigProviderPage *page, backend = e_mail_config_provider_page_get_backend (page); settings = e_mail_config_service_backend_get_settings (backend); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_spacing (GTK_BOX (hbox), 6); gtk_widget_set_margin_left (hbox, STANDARD_MARGIN); gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0); @@ -387,7 +387,7 @@ mail_config_provider_page_add_options (EMailConfigProviderPage *page, provider = e_mail_config_service_backend_get_provider (backend); settings = e_mail_config_service_backend_get_settings (backend); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_spacing (GTK_BOX (hbox), 6); gtk_widget_set_margin_left (hbox, STANDARD_MARGIN); gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0); diff --git a/mail/e-mail-label-action.c b/mail/e-mail-label-action.c index b7d38a99a9..9dc0296774 100644 --- a/mail/e-mail-label-action.c +++ b/mail/e-mail-label-action.c @@ -58,7 +58,7 @@ mail_label_action_menu_item_realize_cb (GtkWidget *menu_item) /* Now add our own child widget. */ - widget = gtk_hbox_new (FALSE, 3); + widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_container_add (GTK_CONTAINER (menu_item), widget); gtk_widget_show (widget); diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c index 839cc75424..5f5b3aa313 100644 --- a/mail/e-mail-label-dialog.c +++ b/mail/e-mail-label-dialog.c @@ -204,7 +204,7 @@ e_mail_label_dialog_init (EMailLabelDialog *dialog) container = content_area; - widget = gtk_hbox_new (FALSE, 6); + widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show (widget); diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c index 2d09cbc523..c5649de216 100644 --- a/mail/e-mail-label-manager.c +++ b/mail/e-mail-label-manager.c @@ -358,7 +358,7 @@ e_mail_label_manager_init (EMailLabelManager *manager) 0, 1, 1, 2, 0, 0, 0, 0); gtk_widget_show (widget); - widget = gtk_vbutton_box_new (); + widget = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); gtk_button_box_set_layout ( GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START); gtk_box_set_spacing (GTK_BOX (widget), 6); diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c index 4ca294fddc..e7920c0c9e 100644 --- a/mail/e-mail-notebook-view.c +++ b/mail/e-mail-notebook-view.c @@ -199,7 +199,7 @@ create_tab_label (EMailNotebookView *view, GtkWidget *container, *widget; GtkAllocation allocation; - widget = gtk_hbox_new (FALSE, 0); + widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (widget); container = widget; diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index cd0c46b570..595bef8bfe 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -351,7 +351,7 @@ get_rule_part_widget (EMFilterContext *f, data->f = f; data->part = newpart; - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); /* only set to automatically clean up the memory and for less_parts */ g_object_set_data_full ((GObject *) hbox, "data", data, g_free); diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index e9baf578ec..3779eef5e5 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -395,7 +395,7 @@ em_folder_selection_button_init (EMFolderSelectionButton *emfsb) emfsb->priv = EM_FOLDER_SELECTION_BUTTON_GET_PRIVATE (emfsb); - box = gtk_hbox_new (FALSE, 4); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_add (GTK_CONTAINER (emfsb), box); gtk_widget_show (box); diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 8b6878caa4..e64f58d380 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -392,7 +392,7 @@ em_folder_selector_create_new (GtkWindow *parent, folder_tree = em_folder_selector_get_folder_tree (emfs); em_folder_tree_set_excluded (folder_tree, EMFT_EXCLUDE_NOINFERIORS); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); w = gtk_label_new_with_mnemonic (_("Folder _name:")); gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, FALSE, 6); emfs->name_entry = (GtkEntry *) gtk_entry_new (); diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c index 69e1271e5f..bb4a74aa39 100644 --- a/mail/em-subscription-editor.c +++ b/mail/em-subscription-editor.c @@ -1688,7 +1688,7 @@ em_subscription_editor_init (EMSubscriptionEditor *editor) container = gtk_dialog_get_content_area (GTK_DIALOG (editor)); - widget = gtk_vbox_new (FALSE, 12); + widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_set_border_width (GTK_CONTAINER (widget), 5); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); gtk_widget_show (widget); @@ -1758,7 +1758,7 @@ em_subscription_editor_init (EMSubscriptionEditor *editor) container = box; - widget = gtk_hbox_new (FALSE, 6); + widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); gtk_widget_show (widget); diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 8722a8d561..6a20bf4120 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -326,7 +326,7 @@ elm_getwidget (EImport *ei, g_datalist_set_data ( &target->data, "elm-do-mail", GINT_TO_POINTER (TRUE)); - box = gtk_vbox_new (FALSE, 2); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); w = gtk_check_button_new_with_label (_("Mail")); gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE); diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index ddbc798374..1e8a09460e 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -135,7 +135,7 @@ mbox_getwidget (EImport *ei, select_uri = g_strdup (uri); } - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); w = gtk_label_new_with_mnemonic (_("_Destination folder:")); gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6); @@ -155,7 +155,7 @@ mbox_getwidget (EImport *ei, G_CALLBACK (folder_selected), target); gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6); - w = gtk_vbox_new (FALSE, 0); + w = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start ((GtkBox *) w, hbox, FALSE, FALSE, 0); gtk_widget_show_all (w); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index eb7e5ade07..4dc6895b04 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -417,7 +417,7 @@ pine_getwidget (EImport *ei, &target->data, "pine-do-addr", GINT_TO_POINTER (TRUE)); - box = gtk_vbox_new (FALSE, 2); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); w = gtk_check_button_new_with_label (_("Mail")); gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE); -- cgit v1.2.3