Revision: 3609 http://geany.svn.sourceforge.net/geany/?rev=3609&view=rev Author: eht16 Date: 2009-02-27 14:06:51 +0000 (Fri, 27 Feb 2009)
Log Message: ----------- Fix broken non-incremental search with the toolbar search entry when pressing Enter (closes #2638180).
Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/toolbar.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-27 14:06:34 UTC (rev 3608) +++ trunk/ChangeLog 2009-02-27 14:06:51 UTC (rev 3609) @@ -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 <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-02-27 14:06:34 UTC (rev 3608) +++ trunk/src/callbacks.c 2009-02-27 14:06:51 UTC (rev 3609) @@ -553,7 +553,7 @@ 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); }
Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2009-02-27 14:06:34 UTC (rev 3608) +++ trunk/src/toolbar.c 2009-02-27 14:06:51 UTC (rev 3609) @@ -199,9 +199,9 @@ 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(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.