SF.net SVN: geany:[5195] trunk

[ntrel at users.sourceforge.net]

Revision: 5195
          http://geany.svn.sourceforge.net/geany/?rev=5195&view=rev
Author:   ntrel
Date:     2010-08-24 12:17:33 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
Include all files if the Find in Files pattern field is enabled and
empty.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-24 12:07:28 UTC (rev 5194)
+++ trunk/ChangeLog	2010-08-24 12:17:33 UTC (rev 5195)
@@ -7,6 +7,9 @@
    doc/geany.html:
    Remove the "Set build working directories" button from the project
    properties dialog (patch by Jiří Techet, thanks).
+ * src/search.c:
+   Include all files if the Find in Files pattern field is enabled and
+   empty.
 
 
 2010-08-23  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2010-08-24 12:07:28 UTC (rev 5194)
+++ trunk/src/search.c	2010-08-24 12:17:33 UTC (rev 5195)
@@ -1321,12 +1321,12 @@
 			g_string_append(gstr, settings.fif_extra_options);
 		}
 	}
-	if (settings.fif_use_files)
+	g_strstrip(settings.fif_files);
+	if (settings.fif_use_files && *settings.fif_files)
 	{
 		GString *tmp;
 
 		/* put --include= before each pattern */
-		g_strstrip(settings.fif_files);
 		tmp = g_string_new(settings.fif_files);
 		do {} while (utils_string_replace_all(tmp, "  ", " "));
 		g_string_prepend_c(tmp, ' ');


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