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()). --- addressbook/gui/merging/eab-contact-merging.c | 12 ++++++------ addressbook/gui/widgets/e-contact-map-window.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index cb2f6055ae..459ae8a62f 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -394,7 +394,7 @@ mergeit (EContactMergingLookup *lookup) continue; } label = gtk_label_new (_("Email")); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0); gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1); @@ -413,7 +413,7 @@ mergeit (EContactMergingLookup *lookup) dropdown, "changed", G_CALLBACK (dropdown_changed), data); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) dropdown, FALSE, FALSE, 0); gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1); gtk_widget_show ((GtkWidget *) dropdown); @@ -422,12 +422,12 @@ mergeit (EContactMergingLookup *lookup) if (((field == E_CONTACT_FULL_NAME) && (!g_ascii_strcasecmp (string, string1)))) { row++; label = gtk_label_new (e_contact_pretty_name (field)); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0); gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1); label = gtk_label_new (string); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0); gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1); continue; @@ -437,7 +437,7 @@ mergeit (EContactMergingLookup *lookup) if (!(string1 && *string1) || (g_ascii_strcasecmp (string, string1))) { row++; label = gtk_label_new (e_contact_pretty_name (field)); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) label, FALSE, FALSE, 0); gtk_table_attach_defaults (table, (GtkWidget *) hbox, 0, 1, row, row + 1); data = g_new0 (dropdown_data, 1); @@ -461,7 +461,7 @@ mergeit (EContactMergingLookup *lookup) dropdown, "changed", G_CALLBACK (dropdown_changed), data); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (hbox), (GtkWidget *) dropdown, FALSE, FALSE, 0); gtk_table_attach_defaults (table, (GtkWidget *) hbox, 1, 2, row, row + 1); gtk_widget_show_all ((GtkWidget *) dropdown); diff --git a/addressbook/gui/widgets/e-contact-map-window.c b/addressbook/gui/widgets/e-contact-map-window.c index aa31f297fe..1dbe694d50 100644 --- a/addressbook/gui/widgets/e-contact-map-window.c +++ b/addressbook/gui/widgets/e-contact-map-window.c @@ -387,7 +387,7 @@ e_contact_map_window_init (EContactMapWindow *window) G_CALLBACK (map_contact_geocoding_failed_cb), window); /* HBox container */ - hbox = gtk_hbox_new (FALSE, 7); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 7); /* Spinner */ button = gtk_spinner_new (); @@ -443,7 +443,7 @@ e_contact_map_window_init (EContactMapWindow *window) viewport = gtk_frame_new (NULL); gtk_container_add (GTK_CONTAINER (viewport), map); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (vbox), viewport); gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); -- cgit v1.2.3