HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When going to a build error, try the current document's path if

Browse Source 
the parsed filename doesn't exist. (This can happen when we receive
build messages in the wrong order - after the 'Leaving directory'
messages).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4488 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2009-12-09 13:28:37 +00:00
parent c6e720a837
commit 450a98934b
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,11 @@
* geany.glade, src/interface.c: * geany.glade, src/interface.c:
Move 'Send Selection to Terminal' menu item from Format to Commands Move 'Send Selection to Terminal' menu item from Format to Commands
submenu. submenu.
* src/msgwindow.c:
When going to a build error, try the current document's path if
the parsed filename doesn't exist. (This can happen when we receive
build messages in the wrong order - after the 'Leaving directory'
messages).
2009-12-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> 2009-12-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

29
src/msgwindow.c
View File

@ -610,9 +610,34 @@ gboolean msgwin_goto_compiler_file_line()
find_prev_build_dir(path, model, &dir); find_prev_build_dir(path, model, &dir);
gtk_tree_path_free(path); gtk_tree_path_free(path);
msgwin_parse_compiler_error_line(string, dir, &filename, &line); msgwin_parse_compiler_error_line(string, dir, &filename, &line);
g_free(dir);
if (dir != NULL) /* If the path doesn't exist, try the current document.
g_free(dir); * This happens when we receive build messages in the wrong order - after the
* 'Leaving directory' messages */
if (!g_file_test(filename, G_FILE_TEST_EXISTS))
{
gchar *cur_dir = utils_get_current_file_dir_utf8();
gchar *name;
if (cur_dir)
{
/* we let the user know we couldn't find the parsed filename from the message window */
setptr(cur_dir, utils_get_locale_from_utf8(cur_dir));
name = g_path_get_basename(filename);
setptr(name, g_build_path(G_DIR_SEPARATOR_S, cur_dir, name, NULL));
g_free(cur_dir);
if (g_file_test(name, G_FILE_TEST_EXISTS))
{
ui_set_statusbar(FALSE, _("Could not find file '%s' - trying the current document path."),
filename);
filename = name;
}
else
g_free(name);
}
}
if (filename != NULL && line > -1) if (filename != NULL && line > -1)
{ {