insert the file type extension and fix a warning when inserting a fileheader in a new document

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@357 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2006-05-22  Nick Treleaven  <nick.treleaven@btinternet.com>
+
+ * src/callbacks.c, src/templates.c:
+   insert the file type extension and fix a warning when inserting a
+   fileheader in a new document
+
+
 2006-05-22  Enrico Troeger  <enrico.troeger@uvena.de>
 
  * src/keybindings.c, src/utils.c: improved toggle visibility of

src/callbacks.c

@@ -2126,12 +2126,16 @@ on_comments_fileheader_activate        (GtkMenuItem     *menuitem,
 {
 	gint idx = document_get_cur_idx();
 	gchar *text;
+	gchar *ext = NULL;
+
+	if (doc_list[idx].file_name == NULL)
+		ext = doc_list[idx].file_type->extension;
 
 	switch (doc_list[idx].file_type->id)
 	{
 		case GEANY_FILETYPES_PASCAL:
 		{
-			text = templates_get_template_fileheader(GEANY_TEMPLATE_FILEHEADER_PASCAL, NULL, idx);
+			text = templates_get_template_fileheader(GEANY_TEMPLATE_FILEHEADER_PASCAL, ext, idx);
 			break;
 		}
 		case GEANY_FILETYPES_PYTHON:
@@ -2140,12 +2144,12 @@ on_comments_fileheader_activate        (GtkMenuItem     *menuitem,
 		case GEANY_FILETYPES_MAKE:
 		case GEANY_FILETYPES_PERL:
 		{
-			text = templates_get_template_fileheader(GEANY_TEMPLATE_FILEHEADER_ROUTE, NULL, idx);
+			text = templates_get_template_fileheader(GEANY_TEMPLATE_FILEHEADER_ROUTE, ext, idx);
 			break;
 		}
 		default:
 		{
-			text = templates_get_template_fileheader(GEANY_TEMPLATE_FILEHEADER, NULL, idx);
+			text = templates_get_template_fileheader(GEANY_TEMPLATE_FILEHEADER, ext, idx);
 		}
 	}
 

src/templates.c

@@ -190,7 +190,7 @@ gchar *templates_get_template_fileheader(gint template, const gchar *extension,
 	gchar *filename;
 	gchar *date = utils_get_date_time();
 
-	if (idx == -1)
+	if (idx == -1 || doc_list[idx].file_name == NULL)
 	{
 		if (extension != NULL)
 			filename = g_strconcat(GEANY_STRING_UNTITLED, ".", extension, NULL);