Use function in midori_findbar_entry_clear_icon_released_cb

This commit is contained in:
Christian Dywan 2011-10-13 01:53:36 +02:00
parent eda8ac68f9
commit bd5c317ad9

View file

@ -112,15 +112,12 @@ static void
midori_findbar_entry_clear_icon_released_cb (GtkIconEntry* entry, midori_findbar_entry_clear_icon_released_cb (GtkIconEntry* entry,
gint icon_pos, gint icon_pos,
gint button, gint button,
gpointer user_data) MidoriFindbar*findbar)
{ {
if (icon_pos == GTK_ICON_ENTRY_SECONDARY) if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
{ {
gtk_entry_set_text (GTK_ENTRY (entry), ""); gtk_entry_set_text (GTK_ENTRY (entry), "");
#if !HAVE_HILDON midori_findbar_set_icon (findbar, GTK_ICON_ENTRY_PRIMARY, "edit-find");
gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND);
#endif
} }
} }
@ -271,7 +268,7 @@ midori_findbar_init (MidoriFindbar* findbar)
gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (findbar->find_text), gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (findbar->find_text),
GTK_ICON_ENTRY_SECONDARY, TRUE); GTK_ICON_ENTRY_SECONDARY, TRUE);
g_signal_connect (findbar->find_text, "icon-release", g_signal_connect (findbar->find_text, "icon-release",
G_CALLBACK (midori_findbar_entry_clear_icon_released_cb), NULL); G_CALLBACK (midori_findbar_entry_clear_icon_released_cb), findbar);
g_signal_connect (findbar->find_text, "activate", g_signal_connect (findbar->find_text, "activate",
G_CALLBACK (midori_findbar_next_activate_cb), findbar); G_CALLBACK (midori_findbar_next_activate_cb), findbar);
g_signal_connect (findbar->find_text, "preedit-changed", g_signal_connect (findbar->find_text, "preedit-changed",