[Xfce4-commits] <midori:master> Use gtk_combo_box_text_new_with_entry in Statusbar Features

[Christian Dywan]

Updating branch refs/heads/master
         to ee85789fc493309a50ce110388dd5ddc94b5ba46 (commit)
       from 52de747198ab38ed8ce7774ea648c9b78fe37e6c (commit)

commit ee85789fc493309a50ce110388dd5ddc94b5ba46
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Oct 20 22:47:27 2011 +0200

    Use gtk_combo_box_text_new_with_entry in Statusbar Features
    
    Fixes: https://bugs.launchpad.net/midori/+bug/878449

 extensions/statusbar-features.c |    4 ++--
 katze/gtk3-compat.h             |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extensions/statusbar-features.c b/extensions/statusbar-features.c
index b3d2c1c..a6b8acc 100644
--- a/extensions/statusbar-features.c
+++ b/extensions/statusbar-features.c
@@ -154,10 +154,10 @@ statusbar_features_app_add_browser_cb (MidoriApp*       app,
     gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
     button = katze_property_proxy (settings, "identify-as", "custom-user-agent");
     gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
-    button = gtk_combo_box_entry_new_text ();
+    button = gtk_combo_box_text_new_with_entry ();
     gtk_entry_set_width_chars (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (button))), 4);
     for (i = 0; i < G_N_ELEMENTS (zoom_levels); i++)
-        gtk_combo_box_append_text (GTK_COMBO_BOX (button), zoom_levels[i].label);
+        gtk_combo_box_text_append_text (GTK_COMBO_BOX (button), zoom_levels[i].label);
     gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
     g_signal_connect (button, "changed",
         G_CALLBACK (statusbar_features_zoom_level_changed_cb), browser);
diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h
index c40aca2..b1b3b10 100644
--- a/katze/gtk3-compat.h
+++ b/katze/gtk3-compat.h
@@ -77,6 +77,7 @@ gtk_tool_item_set_tooltip_text         (GtkToolItem*       toolitem,
 #if !GTK_CHECK_VERSION (2, 24 ,0)
     #define gtk_combo_box_text_append_text gtk_combo_box_append_text
     #define gtk_combo_box_text_new gtk_combo_box_new_text
+    #define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text
     #define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text
     #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
     #define GtkComboBoxText GtkComboBox