diff options
| author | Matthias Classen <mclassen@redhat.com> | 2010-10-21 17:58:08 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2010-10-21 17:58:08 +0800 |
| commit | 60fdf062468a581293d651da936dd5485ef32c8f (patch) | |
| tree | 1de94ea93d30ca3065411308fc854f7bb7fb890a | |
| parent | ab1ddba880306b133d221822cc610f1276d38e20 (diff) | |
| download | gsoc2013-epiphany-60fdf062468a581293d651da936dd5485ef32c8f.tar gsoc2013-epiphany-60fdf062468a581293d651da936dd5485ef32c8f.tar.gz gsoc2013-epiphany-60fdf062468a581293d651da936dd5485ef32c8f.tar.bz2 gsoc2013-epiphany-60fdf062468a581293d651da936dd5485ef32c8f.tar.lz gsoc2013-epiphany-60fdf062468a581293d651da936dd5485ef32c8f.tar.xz gsoc2013-epiphany-60fdf062468a581293d651da936dd5485ef32c8f.tar.zst gsoc2013-epiphany-60fdf062468a581293d651da936dd5485ef32c8f.zip | |
Use the new GtkComboText APIs
Signed-off-by: Xan Lopez <xan@gnome.org>
| -rw-r--r-- | lib/widgets/ephy-zoom-control.c | 4 | ||||
| -rw-r--r-- | lib/widgets/testspinner.c | 8 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 6 | ||||
| -rw-r--r-- | src/ephy-history-window.c | 12 |
4 files changed, 15 insertions, 15 deletions
diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c index d22e58124..c61c9941c 100644 --- a/lib/widgets/ephy-zoom-control.c +++ b/lib/widgets/ephy-zoom-control.c @@ -101,11 +101,11 @@ ephy_zoom_control_init (EphyZoomControl *control) p->zoom = 1.0; - combo = p->combo = GTK_COMBO_BOX (gtk_combo_box_new_text ()); + combo = p->combo = GTK_COMBO_BOX (gtk_combo_box_text_new ()); for (i = 0; i < n_zoom_levels; i++) { - gtk_combo_box_append_text (combo, _(zoom_levels[i].name)); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(zoom_levels[i].name)); } p->combo = combo; diff --git a/lib/widgets/testspinner.c b/lib/widgets/testspinner.c index e95155484..be5d256f1 100644 --- a/lib/widgets/testspinner.c +++ b/lib/widgets/testspinner.c @@ -223,20 +223,20 @@ int main(int argc, char **argv) g_signal_connect (widget, "toggled", G_CALLBACK (spin_toolbar_spinner_cb), item); gtk_box_pack_start (GTK_BOX (vbox2), widget, FALSE, FALSE, 0); - combo = gtk_combo_box_new_text (); + combo = gtk_combo_box_text_new (); g_signal_connect (combo, "changed", G_CALLBACK (change_toolbar_style_cb), toolbar); for (i = 0; i < G_N_ELEMENTS (toolbar_styles); ++i) { - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), toolbar_styles[i]); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), toolbar_styles[i]); } gtk_combo_box_set_active (GTK_COMBO_BOX (combo), GTK_TOOLBAR_BOTH); gtk_box_pack_start (GTK_BOX (vbox2), combo, FALSE, FALSE, 0); - combo = gtk_combo_box_new_text (); + combo = gtk_combo_box_text_new (); g_signal_connect (combo, "changed", G_CALLBACK (change_toolbar_icon_size_cb), toolbar); for (i = 0; i < G_N_ELEMENTS (icon_sizes); ++i) { - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), icon_sizes[i]); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), icon_sizes[i]); } gtk_combo_box_set_active (GTK_COMBO_BOX (combo), GTK_ICON_SIZE_INVALID); gtk_box_pack_start (GTK_BOX (vbox2), combo, FALSE, FALSE, 0); diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 32a25caa1..be79d00f1 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -889,13 +889,13 @@ cmd_bookmarks_export (GtkAction *action, /* Make a format selection combo & label */ label = gtk_label_new_with_mnemonic (_("File f_ormat:")); - combo = gtk_combo_box_new_text (); + combo = gtk_combo_box_text_new (); gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo); for (format = 0; format < G_N_ELEMENTS (export_formats); ++format) { - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), - _(export_formats[format].name)); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), + _(export_formats[format].name)); } g_object_set_data (G_OBJECT (dialog), "format-combo", combo); diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index ba81c6e0d..f3626b21e 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -952,24 +952,24 @@ build_search_box (EphyHistoryWindow *editor) gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); gtk_widget_show (label); - combo = gtk_combo_box_new_text (); + combo = gtk_combo_box_text_new (); gtk_widget_show (combo); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Last 30 minutes")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Today")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Last 30 minutes")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Today")); str = g_strdup_printf (ngettext ("Last %d day", "Last %d days", 2), 2); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str); g_free (str); str = g_strdup_printf (ngettext ("Last %d day", "Last %d days", 3), 3); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str); g_free (str); /* keep this in sync with embed/ephy-history.c's * HISTORY_PAGE_OBSOLETE_DAYS */ str = g_strdup_printf (ngettext ("Last %d day", "Last %d days", 10), 10); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str); g_free (str); g_settings_bind (EPHY_SETTINGS_STATE, |