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

[eht16 at users.sourceforge.net]

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

Log Message:
-----------
Backport from trunk:
Fix adding the filetype's default extension when using the Instant Save plugin (closes #2885142).

Modified Paths:
--------------
    branches/geany-0.18.1/ChangeLog
    branches/geany-0.18.1/plugins/saveactions.c

Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog	2010-01-31 16:25:14 UTC (rev 4608)
+++ branches/geany-0.18.1/ChangeLog	2010-01-31 16:25:37 UTC (rev 4609)
@@ -42,6 +42,13 @@
    Add 'Doc-comments' plugin API subsection.
 
 
+2009-10-25  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/saveactions.c:
+   Fix adding the filetype's default extension when using the
+   Instant Save plugin (closes #2885142).
+
+
 2009-10-19  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * THANKS, src/about.c:

Modified: branches/geany-0.18.1/plugins/saveactions.c
===================================================================
--- branches/geany-0.18.1/plugins/saveactions.c	2010-01-31 16:25:14 UTC (rev 4608)
+++ branches/geany-0.18.1/plugins/saveactions.c	2010-01-31 16:25:37 UTC (rev 4609)
@@ -250,7 +250,7 @@
 		if (fd != -1)
 			close(fd); /* close the returned file descriptor as we only need the filename */
 
-		if (ft == NULL)
+		if (ft == NULL || ft->id == GEANY_FILETYPES_NONE)
 			/* ft is NULL when a new file without template was opened, so use the
 			 * configured default file type */
 			ft = filetypes_lookup_by_name(instantsave_default_ft);


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