project-wizard: bgo #727630 - Do not guess user's email address when creating...

project-wizard: bgo #727630 - Do not guess user's email address when creating the comment block at the top of new files

plugins/project-wizard/druid.c

@@ -1336,11 +1336,6 @@ npw_druid_add_default_property (NPWDruid* druid)
 
 	/* Add Email address */
 	s = g_settings_get_string (settings,LAST_EMAIL);
-	if (*s == '\0')
-	{
-		g_free (s);
-		s = anjuta_util_get_user_mail();
-	}
 	g_hash_table_insert (druid->values, g_strdup (EMAIL_ADDRESS_PROPERTY), s);
 	g_object_unref (settings);
 

plugins/project-wizard/templates/anjuta-plugin/src/plugin.c

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * plugin.c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/anjuta-plugin/src/plugin.h

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * plugin.h
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/cpp/src/main.cc

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.cc
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/gnome-shell-extension/src/extension.js

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * extension.js
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/gtk/src/main.c

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/gtkapplication/src/application.c

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * [+NameLower+].c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/gtkapplication/src/application.h

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * [+NameLower+].h
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/gtkapplication/src/main.c

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  *
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+] 
  */

plugins/project-wizard/templates/gtkmm/src/main.cc

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.cc
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/java/src/main.java

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * [+MainClass+].java
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/library/src/lib.c

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * lib.c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/library/src/lib.h

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * lib.h
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/mkfile/src/main.c

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/pygtk/src/main.py

@@ -6,7 +6,7 @@
 [+INVOKE START-INDENT\+]
 #
 # main.py
-# Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+# Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
 # 
 [+INVOKE LICENSE-DESCRIPTION PFX="# " PROGRAM=(get "Name") OWNER=(get "Author") \+]
 

plugins/project-wizard/templates/python/src/main.py

@@ -6,7 +6,7 @@
 [+INVOKE START-INDENT\+]
 #
 # main.py
-# Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+# Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
 # 
 [+INVOKE LICENSE-DESCRIPTION PFX="# " PROGRAM=(get "Name") OWNER=(get "Author") \+]
 

plugins/project-wizard/templates/sdl/src/main.c

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/terminal/src/main.c

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/vala-gtk/src/main.vala

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.c
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */

plugins/project-wizard/templates/wxwin/src/main.cc

@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * main.cc
- * Copyright (C) [+(shell "date +%Y")+] [+Author+] <[+Email+]>
+ * Copyright (C) [+(shell "date +%Y")+] [+Author+][+IF (get "Email")+] <[+Email+]>[+ENDIF+]
  * 
 [+INVOKE LICENSE-DESCRIPTION PFX=" * " PROGRAM=(get "Name") OWNER=(get "Author") \+]
  */