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

Use proper button to set current page as homepage

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/767389
This commit is contained in:
Christian Dywan 2011-05-15 02:27:21 +02:00
parent f2fa49f342
commit fdf73ce98d
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
midori/midori-preferences.c
View file

@ -159,17 +159,9 @@ midori_preferences_new (GtkWindow* parent,
return GTK_WIDGET (preferences); return GTK_WIDGET (preferences);
} }
#if GTK_CHECK_VERSION (2, 16, 0)
static void
midori_preferences_homepage_icon_press_cb (GtkWidget* button,
GtkEntryIconPosition position,
GdkEvent* event,
MidoriWebSettings* settings)
#else
static void static void
midori_preferences_homepage_current_clicked_cb (GtkWidget* button, midori_preferences_homepage_current_clicked_cb (GtkWidget* button,
MidoriWebSettings* settings) MidoriWebSettings* settings)
#endif
{ {
GtkWidget* preferences = gtk_widget_get_toplevel (button); GtkWidget* preferences = gtk_widget_get_toplevel (button);
GtkWidget* browser = katze_object_get_object (preferences, "transient-for"); GtkWidget* browser = katze_object_get_object (preferences, "transient-for");
@ -311,22 +303,16 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
SPANNED_ADD (entry); SPANNED_ADD (entry);
if (parent && katze_object_has_property (parent, "uri")) if (parent && katze_object_has_property (parent, "uri"))
{ {
#if GTK_CHECK_VERSION (2, 16, 0) #if 0
gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), button = gtk_button_new_with_mnemonic (_("Use _current page"));
GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_JUMP_TO);
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY, _("Use current page as homepage"));
g_signal_connect (entry, "icon-press",
G_CALLBACK (midori_preferences_homepage_icon_press_cb), settings);
#else #else
button = gtk_button_new (); label = gtk_label_new (NULL);
label = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); INDENTED_ADD (label);
gtk_button_set_image (GTK_BUTTON (button), label); button = gtk_button_new_with_label (_("Use current page as homepage"));
gtk_widget_set_tooltip_text (button, _("Use current page as homepage")); #endif
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (midori_preferences_homepage_current_clicked_cb), settings); G_CALLBACK (midori_preferences_homepage_current_clicked_cb), settings);
SPANNED_ADD (button); SPANNED_ADD (button);
#endif
} }
/* Page "Appearance" */ /* Page "Appearance" */