Kaydet (Commit) 4f6354d4 authored tarafından Enrico Tröger's avatar Enrico Tröger

Respect saved state of 'Case sensitive' option when using the 'Regular expressions' option as well.

Cleanup.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5575 ea778897-0a13-0410-b9d1-a72fbfd435f5
üst 7ebea499
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
* src/search.c: * src/search.c:
Remember Find and Replace options across restarts Remember Find and Replace options across restarts
(patch by Dimitar Zhekov, thanks). (patch by Dimitar Zhekov, thanks).
Cleanup.
Respect saved state of 'Case sensitive' option when using
the 'Regular expressions' option as well.
2011-03-05 Colomban Wendling <colomban(at)geany(dot)org> 2011-03-05 Colomban Wendling <colomban(at)geany(dot)org>
......
...@@ -191,7 +191,7 @@ static void init_prefs(void) ...@@ -191,7 +191,7 @@ static void init_prefs(void)
stash_group_add_integer(group, &fif_dlg.position[0], "position_fif_x", -1); stash_group_add_integer(group, &fif_dlg.position[0], "position_fif_x", -1);
stash_group_add_integer(group, &fif_dlg.position[1], "position_fif_y", -1); stash_group_add_integer(group, &fif_dlg.position[1], "position_fif_y", -1);
memset(&settings, '\0', sizeof settings); memset(&settings, '\0', sizeof(settings));
group = stash_group_new("search"); group = stash_group_new("search");
fif_prefs = group; fif_prefs = group;
...@@ -1049,9 +1049,12 @@ on_find_replace_checkbutton_toggled(GtkToggleButton *togglebutton, gpointer user ...@@ -1049,9 +1049,12 @@ on_find_replace_checkbutton_toggled(GtkToggleButton *togglebutton, gpointer user
if (regex_set) /* regex enabled */ if (regex_set) /* regex enabled */
{ {
/* Enable case sensitive but remember original case toggle state */ if (GTK_WIDGET_VISIBLE(dialog))
case_state[replace] = gtk_toggle_button_get_active(check_case); {
gtk_toggle_button_set_active(check_case, TRUE); /* Enable case sensitive but remember original case toggle state */
case_state[replace] = gtk_toggle_button_get_active(check_case);
gtk_toggle_button_set_active(check_case, TRUE);
}
} }
else /* regex disabled */ else /* regex disabled */
{ {
...@@ -1245,7 +1248,6 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) ...@@ -1245,7 +1248,6 @@ on_replace_dialog_response(GtkDialog *dialog, gint response, gpointer user_data)
GeanyDocument *doc = document_get_current(); GeanyDocument *doc = document_get_current();
gint search_flags_re; gint search_flags_re;
gboolean search_backwards_re, search_replace_escape_re; gboolean search_backwards_re, search_replace_escape_re;
gboolean close_window;
gchar *find, *replace; gchar *find, *replace;
gtk_window_get_position(GTK_WINDOW(replace_dlg.dialog), gtk_window_get_position(GTK_WINDOW(replace_dlg.dialog),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment