SF.net SVN: geany:[5575] trunk

[eht16 at users.sourceforge.net]

Revision: 5575
          http://geany.svn.sourceforge.net/geany/?rev=5575&view=rev
Author:   eht16
Date:     2011-03-06 14:36:42 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
Respect saved state of 'Case sensitive' option when using the 'Regular expressions' option as well.
Cleanup.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/search.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-03-06 14:26:08 UTC (rev 5574)
+++ trunk/ChangeLog	2011-03-06 14:36:42 UTC (rev 5575)
@@ -5,6 +5,9 @@
  * src/search.c:
    Remember Find and Replace options across restarts
    (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>

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2011-03-06 14:26:08 UTC (rev 5574)
+++ trunk/src/search.c	2011-03-06 14:36:42 UTC (rev 5575)
@@ -191,7 +191,7 @@
 	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);
 
-	memset(&settings, '\0', sizeof settings);
+	memset(&settings, '\0', sizeof(settings));
 
 	group = stash_group_new("search");
 	fif_prefs = group;
@@ -1049,9 +1049,12 @@
 
 		if (regex_set)	/* regex enabled */
 		{
-			/* 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);
+			if (GTK_WIDGET_VISIBLE(dialog))
+			{
+				/* 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 */
 		{
@@ -1245,7 +1248,6 @@
 	GeanyDocument *doc = document_get_current();
 	gint search_flags_re;
 	gboolean search_backwards_re, search_replace_escape_re;
-	gboolean close_window;
 	gchar *find, *replace;
 
 	gtk_window_get_position(GTK_WINDOW(replace_dlg.dialog),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.