Parse lines in the Messages window even if Find in Files hasn't

been used yet (patch by Jiří Techet, thanks).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5084 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2010-07-02 12:43:39 +00:00
parent 8358177099
commit 56b844a509
2 changed files with 9 additions and 2 deletions

View File

@ -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>

View File

@ -1010,6 +1010,7 @@ gboolean msgwin_goto_messages_file_line(guint keyval)
else if (line < 0 && string != NULL)
{
gchar *filename;
msgwin_parse_grep_line(string, &filename, &line);
if (filename != NULL && line > -1)
{
@ -1042,7 +1043,7 @@ static void msgwin_parse_grep_line(const gchar *string, gchar **filename, gint *
*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 @@ static void msgwin_parse_grep_line(const gchar *string, gchar **filename, gint *
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);
}