SF.net SVN: geany:[4610] branches/geany-0.18.1

[eht16 at users.sourceforge.net]

Revision: 4610
          http://geany.svn.sourceforge.net/geany/?rev=4610&view=rev
Author:   eht16
Date:     2010-01-31 16:26:13 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Backport from trunk:
Before looking for line and column numbers specified as part of a filename, ensure the file doesn't exist on disk. This allows opening of files like "test:0".

Modified Paths:
--------------
    branches/geany-0.18.1/ChangeLog
    branches/geany-0.18.1/src/main.c

Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog	2010-01-31 16:25:37 UTC (rev 4609)
+++ branches/geany-0.18.1/ChangeLog	2010-01-31 16:26:13 UTC (rev 4610)
@@ -47,6 +47,10 @@
  * plugins/saveactions.c:
    Fix adding the filetype's default extension when using the
    Instant Save plugin (closes #2885142).
+ * src/main.c:
+   Before looking for line and column numbers specified as part
+   of a filename, ensure the file doesn't exist on disk. This allows
+   opening of files like "test:0".
 
 
 2009-10-19  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: branches/geany-0.18.1/src/main.c
===================================================================
--- branches/geany-0.18.1/src/main.c	2010-01-31 16:25:37 UTC (rev 4609)
+++ branches/geany-0.18.1/src/main.c	2010-01-31 16:26:13 UTC (rev 4610)
@@ -316,6 +316,10 @@
 	if (! NZV(filename))
 		return;
 
+	/* allow to open files like "test:0" */
+	if (g_file_test(filename, G_FILE_TEST_EXISTS))
+		return;
+
 	len = strlen(filename);
 	for (i = len - 1; i >= 1; i--)
 	{


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