luon
/
gnoemoe
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed replacing

This commit is contained in:
Jesse van den Kieboom 2005-12-23 16:08:22 +00:00
parent 2437dc3da2
commit dec19edcdb
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnoemoe/widgets/gm-searchable.c
View File

@ -42,13 +42,13 @@ gm_searchable_text_view_find_next(GtkTextView *text_view, const gchar *str,
if (buffer) { if (buffer) {
if (!gtk_text_buffer_get_selection_bounds(buffer, &start, &end)) { if (!gtk_text_buffer_get_selection_bounds(buffer, &start, &end)) {
// For editables, search from the insertion position // For cursor_visibles, search from the insertion position
if (gtk_text_view_get_editable(text_view)) { if (gtk_text_view_get_cursor_visible(text_view)) {
gtk_text_buffer_get_iter_at_mark(buffer, &end, gtk_text_buffer_get_iter_at_mark(buffer, &end,
gtk_text_buffer_get_insert(buffer)); gtk_text_buffer_get_insert(buffer));
} else { } else {
// For non editables, search from start (or end, depending on // For non cursor_visibles, search from start (or end,
// the search direction // depending on2 the search direction
if (flags & GM_SEARCHABLE_SEARCH_FORWARDS) { if (flags & GM_SEARCHABLE_SEARCH_FORWARDS) {
gtk_text_buffer_get_start_iter(buffer, &end); gtk_text_buffer_get_start_iter(buffer, &end);
} else { } else {
@ -278,13 +278,13 @@ gm_searchable_replace(GmSearchable *self, const gchar *replace) {
text_view = gm_searchable_interface_get_text_view(self, iface); text_view = gm_searchable_interface_get_text_view(self, iface);
if (text_view && gtk_text_view_get_editable(text_view)) { if (text_view && gtk_text_view_get_editable(text_view)) {
return gm_searchable_text_view_replace(text_view, replace, flags); return gm_searchable_text_view_replace(text_view, replace);
} else { } else {
g_return_val_if_reached(FALSE); g_return_val_if_reached(FALSE);
} }
} }
return (* iface->replace) (self, replace, flags); return (* iface->replace) (self, replace);
} }
gboolean gboolean

5
gnoemoe/widgets/gm-searchable.h
View File

@ -47,9 +47,8 @@ gboolean gm_searchable_find_next(GmSearchable *self, const gchar *str,
GmSearchableSearchFlags flags); GmSearchableSearchFlags flags);
gboolean gm_searchable_can_replace(GmSearchable *self); gboolean gm_searchable_can_replace(GmSearchable *self);
gboolean gm_searchable_replace(GmSearchable *self, gchar const *str, gboolean gm_searchable_replace(GmSearchable *self, gchar const *replace);
GmSearchableSearchFlags flags);
gboolean gm_searchable_replace_all(GmSearchable *self, gchar const *str, gboolean gm_searchable_replace_all(GmSearchable *self, gchar const *str,
GmSearchableSearchFlags flags); gchar const *replace, GmSearchableSearchFlags flags);
#endif /* __GM_SEARCHABLE_H__ */ #endif /* __GM_SEARCHABLE_H__ */