Revision: 4808 http://geany.svn.sourceforge.net/geany/?rev=4808&view=rev Author: eht16 Date: 2010-04-07 21:09:56 +0000 (Wed, 07 Apr 2010)
Log Message: ----------- Fix disabled compiler message tracking if using indicators to show build errors is disabled (closes #2982834).
Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/msgwindow.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-04-07 19:51:48 UTC (rev 4807) +++ trunk/ChangeLog 2010-04-07 21:09:56 UTC (rev 4808) @@ -2,6 +2,9 @@
* doc/geany.txt, doc/geany.html: Improve wording. + * src/build.c, src/msgwindow.c: + Fix disabled compiler message tracking if using indicators to + show build errors is disabled (closes #2982834).
2010-04-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2010-04-07 19:51:48 UTC (rev 4807) +++ trunk/src/build.c 2010-04-07 21:09:56 UTC (rev 4808) @@ -967,7 +967,7 @@ if (! NZV(msg)) return;
- if (editor_prefs.use_indicators && build_info.message_count < GEANY_BUILD_ERR_HIGHLIGHT_MAX) + if (build_info.message_count < GEANY_BUILD_ERR_HIGHLIGHT_MAX) { gchar *filename; gint line; @@ -983,7 +983,7 @@ { GeanyDocument *doc = document_find_by_filename(filename);
- if (doc) + if (doc && editor_prefs.use_indicators) { if (line > 0) /* some compilers, like pdflatex report errors on line 0 */ line--; /* so only adjust the line number if it is greater than 0 */
Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2010-04-07 19:51:48 UTC (rev 4807) +++ trunk/src/msgwindow.c 2010-04-07 21:09:56 UTC (rev 4808) @@ -633,7 +633,7 @@ { gboolean ret;
- if (! doc->changed) /* if modified, line may be wrong */ + if (! doc->changed && editor_prefs.use_indicators) /* if modified, line may be wrong */ editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line - 1);
ret = navqueue_goto_line(old_doc, doc, line);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.