diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-20 07:42:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-20 08:08:01 +0800 |
| commit | 8e2902eefc466c662bd7bef0533de05db0897c49 (patch) | |
| tree | 60390d16d242307e7dfc3310149e23acf1f225bf /addressbook/gui/merging/eab-contact-merging.c | |
| parent | 88c48563537f3e7777193ff9ba5d9418f0038390 (diff) | |
| download | gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.tar gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.tar.gz gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.tar.bz2 gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.tar.lz gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.tar.xz gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.tar.zst gsoc2013-evolution-8e2902eefc466c662bd7bef0533de05db0897c49.zip | |
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()).
Diffstat (limited to 'addressbook/gui/merging/eab-contact-merging.c')
| -rw-r--r-- | addressbook/gui/merging/eab-contact-merging.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); |