sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix broken non-incremental search with the toolbar search entry when pressing Enter (closes #2638180).

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3609 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-02-27 14:06:51 +00:00
parent 57c761dea2
commit cff3f126ac
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@
Update source files upon creation. Update source files upon creation.
* data/c99.tags: * data/c99.tags:
Update C tags for glibc 2.9. 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 <frank(at)frank(dot)uvena(dot)de> 2009-02-26 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>

2
src/callbacks.c
View File

@ -553,7 +553,7 @@ on_toolbar_search_entry_changed(GtkAction *action, const gchar *text, gpointer u
gboolean result; gboolean result;
setup_find_next(text); 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) if (search_data.search_bar)
ui_set_search_entry_background(toolbar_get_widget_child_by_name("SearchEntry"), result); ui_set_search_entry_background(toolbar_get_widget_child_by_name("SearchEntry"), result);
} }

4
src/toolbar.c
View File

@ -199,9 +199,9 @@ GtkWidget *toolbar_init(void)
action_searchentry = geany_entry_action_new( action_searchentry = geany_entry_action_new(
"SearchEntry", _("Search"), _("Find the entered text in the current file"), FALSE); "SearchEntry", _("Search"), _("Find the entered text in the current file"), FALSE);
g_signal_connect(action_searchentry, "entry-activate", 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_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); gtk_action_group_add_action(group, action_searchentry);
action_gotoentry = geany_entry_action_new( action_gotoentry = geany_entry_action_new(