From cff3f126acf54a25a34fb4295860d38855a1088d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Fri, 27 Feb 2009 14:06:51 +0000 Subject: [PATCH] Fix broken non-incremental search with the toolbar search entry when pressing Enter (closes #2638180). git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3609 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 3 +++ src/callbacks.c | 2 +- src/toolbar.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ee7c51a3..7fa1cd82d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ Update source files upon creation. * data/c99.tags: Update C tags for glibc 2.9. + * src/callbacks.c, src/toolbar.c: + Fix broken non-incremental search with the toolbar search entry when + pressing Enter (closes #2638180). 2009-02-26 Frank Lanitz diff --git a/src/callbacks.c b/src/callbacks.c index db59c6eff..a2670d6ce 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -553,7 +553,7 @@ on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpointer u gboolean result; setup_find_next(text); - result = document_search_bar_find(doc, search_data.text, 0, TRUE); + result = document_search_bar_find(doc, search_data.text, 0, GPOINTER_TO_INT(user_data)); if (search_data.search_bar) ui_set_search_entry_background(toolbar_get_widget_child_by_name("SearchEntry"), result); } diff --git a/src/toolbar.c b/src/toolbar.c index eea9a2492..9223d8fe1 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -199,9 +199,9 @@ GtkWidget *toolbar_init(void) action_searchentry = geany_entry_action_new( "SearchEntry", _("Search"), _("Find the entered text in the current file"), FALSE); g_signal_connect(action_searchentry, "entry-activate", - G_CALLBACK(on_toolbar_search_entry_changed), NULL); + G_CALLBACK(on_toolbar_search_entry_changed), GINT_TO_POINTER(FALSE)); g_signal_connect(action_searchentry, "entry-changed", - G_CALLBACK(on_toolbar_search_entry_changed), NULL); + G_CALLBACK(on_toolbar_search_entry_changed), GINT_TO_POINTER(TRUE)); gtk_action_group_add_action(group, action_searchentry); action_gotoentry = geany_entry_action_new(