SF.net SVN: geany:[3627] trunk

[eht16 at users.sourceforge.net]

Revision: 3627
          http://geany.svn.sourceforge.net/geany/?rev=3627&view=rev
Author:   eht16
Date:     2009-03-13 17:23:56 +0000 (Fri, 13 Mar 2009)

Log Message:
-----------
When using Find All in the Find dialog, display matches only once per line in the messages window (patch by Bert Vermeulen, thanks).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-13 10:02:29 UTC (rev 3626)
+++ trunk/ChangeLog	2009-03-13 17:23:56 UTC (rev 3627)
@@ -4,6 +4,9 @@
    src/main.c, src/plugindata.h, src/plugins.c, src/prefs.c,
    src/prefs.h:
    Add an option to set an additional plugin lookup path.
+ * src/search.c:
+   When using Find All in the Find dialog, display matches only once
+   per line in the messages window (patch by Bert Vermeulen, thanks).
 
 
 2009-03-10  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2009-03-13 10:02:29 UTC (rev 3626)
+++ trunk/src/search.c	2009-03-13 17:23:56 UTC (rev 3627)
@@ -1603,6 +1603,7 @@
 	while (1)
 	{
 		gint pos, line, start, find_len;
+		gint prev_line = -1;
 
 		pos = sci_find_text(doc->editor->sci, flags, &ttf);
 		if (pos == -1)
@@ -1613,10 +1614,14 @@
 
 		count++;
 		line = sci_get_line_from_position(doc->editor->sci, pos);
-		buffer = sci_get_line(doc->editor->sci, line);
-		msgwin_msg_add(COLOR_BLACK, line + 1, doc,
-			"%s:%d : %s", short_file_name, line + 1, g_strstrip(buffer));
-		g_free(buffer);
+		if (line != prev_line)
+		{
+			buffer = sci_get_line(doc->editor->sci, line);
+			msgwin_msg_add(COLOR_BLACK, line + 1, doc,
+				"%s:%d : %s", short_file_name, line + 1, g_strstrip(buffer));
+			g_free(buffer);
+			prev_line = line;
+		}
 
 		start = ttf.chrgText.cpMax + 1;
 		ttf.chrg.cpMin = start;


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