SF.net SVN: geany:[5579] trunk

[eht16 at users.sourceforge.net]

Revision: 5579
          http://geany.svn.sourceforge.net/geany/?rev=5579&view=rev
Author:   eht16
Date:     2011-03-06 17:13:45 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
Use the full filename and add the extension of the export format.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/export.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-03-06 17:10:30 UTC (rev 5578)
+++ trunk/ChangeLog	2011-03-06 17:13:45 UTC (rev 5579)
@@ -11,6 +11,7 @@
  * plugins/export.c:
    Add option to insert line numbers (closes #3197150).
    Cleanup.
+   Use the full filename and add the extension of the export format.
 
 
 2011-03-05  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/plugins/export.c
===================================================================
--- trunk/plugins/export.c	2011-03-06 17:10:30 UTC (rev 5578)
+++ trunk/plugins/export.c	2011-03-06 17:13:45 UTC (rev 5579)
@@ -216,7 +216,6 @@
 	if (doc->file_name != NULL)
 	{
 		gchar *base_name = g_path_get_basename(doc->file_name);
-		gchar *short_name = utils_remove_ext_from_filename(base_name);
 		gchar *file_name;
 		gchar *locale_filename;
 		gchar *locale_dirname;
@@ -225,7 +224,7 @@
 		if (g_str_has_suffix(doc->file_name, extension))
 			suffix = "_export";
 
-		file_name = g_strconcat(short_name, suffix, extension, NULL);
+		file_name = g_strconcat(base_name, suffix, extension, NULL);
 		locale_filename = utils_get_locale_from_utf8(doc->file_name);
 		locale_dirname = g_path_get_dirname(locale_filename);
 		/* set the current name to base_name.html which probably doesn't exist yet so
@@ -235,7 +234,6 @@
 		gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), file_name);
 		g_free(locale_dirname);
 		g_free(locale_filename);
-		g_free(short_name);
 		g_free(file_name);
 		g_free(base_name);
 	}


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