debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use gtk_combo_box_text_new_with_entry in Statusbar Features

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/878449
This commit is contained in:
Christian Dywan 2011-10-20 22:47:27 +02:00
parent 52de747198
commit ee85789fc4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/statusbar-features.c
View file

@ -154,10 +154,10 @@ statusbar_features_app_add_browser_cb (MidoriApp* app,
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
button = katze_property_proxy (settings, "identify-as", "custom-user-agent"); button = katze_property_proxy (settings, "identify-as", "custom-user-agent");
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2); 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); 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++) 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); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 2);
g_signal_connect (button, "changed", g_signal_connect (button, "changed",
G_CALLBACK (statusbar_features_zoom_level_changed_cb), browser); G_CALLBACK (statusbar_features_zoom_level_changed_cb), browser);

1
katze/gtk3-compat.h
View file

@ -77,6 +77,7 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem,
#if !GTK_CHECK_VERSION (2, 24 ,0) #if !GTK_CHECK_VERSION (2, 24 ,0)
#define gtk_combo_box_text_append_text gtk_combo_box_append_text #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 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_get_active_text gtk_combo_box_get_active_text
#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
#define GtkComboBoxText GtkComboBox #define GtkComboBoxText GtkComboBox