SF.net SVN: geany:[5084] trunk

[ntrel at users.sourceforge.net]

Revision: 5084
          http://geany.svn.sourceforge.net/geany/?rev=5084&view=rev
Author:   ntrel
Date:     2010-07-02 12:43:39 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
Parse lines in the Messages window even if Find in Files hasn't
been used yet (patch by Ji?\197?\153?\195?\173 Techet, thanks).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-07-02 12:19:00 UTC (rev 5083)
+++ trunk/ChangeLog	2010-07-02 12:43:39 UTC (rev 5084)
@@ -6,6 +6,9 @@
  * src/ui_utils.c:
    Fix only adding project base path to Find in Files history if it
    isn't already there (oops).
+ * src/msgwindow.c:
+   Parse lines in the Messages window even if Find in Files hasn't
+   been used yet (patch by Jiří Techet, thanks).
 
 
 2010-07-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/msgwindow.c
===================================================================
--- trunk/src/msgwindow.c	2010-07-02 12:19:00 UTC (rev 5083)
+++ trunk/src/msgwindow.c	2010-07-02 12:43:39 UTC (rev 5084)
@@ -1010,6 +1010,7 @@
 		else if (line < 0 && string != NULL)
 		{
 			gchar *filename;
+
 			msgwin_parse_grep_line(string, &filename, &line);
 			if (filename != NULL && line > -1)
 			{
@@ -1042,7 +1043,7 @@
 	*filename = NULL;
 	*line = -1;
 
-	if (string == NULL || msgwindow.find_in_files_dir == NULL)
+	if (string == NULL)
 		return;
 
 	/* conflict:3:conflicting types for `foo' */
@@ -1053,7 +1054,10 @@
 	data.file_idx = 0;
 
 	parse_file_line(&data, filename, line);
-	make_absolute(filename, msgwindow.find_in_files_dir);
+
+	/* FIF dir should be set, but a plugin might not have set it */
+	if (msgwindow.find_in_files_dir != NULL)
+		make_absolute(filename, msgwindow.find_in_files_dir);
 }
 
 


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