[anjuta] project-wizard: bgo #727630 - Do not guess user's email address when creating the comment block at t

From: Sebastien Granjoux <sgranjoux src gnome org>
To: commits-list gnome org
Cc:
Subject: [anjuta] project-wizard: bgo #727630 - Do not guess user's email address when creating the comment block at t
Date: Tue, 15 Apr 2014 19:13:33 +0000 (UTC)
commit dc84c85f40ca5a22e1bbbecae86a1b165187323c
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Tue Apr 15 21:12:19 2014 +0200

    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                     |    5 -----
 .../templates/anjuta-plugin/src/plugin.c           |    2 +-
 .../templates/anjuta-plugin/src/plugin.h           |    2 +-
 plugins/project-wizard/templates/cpp/src/main.cc   |    2 +-
 .../gnome-shell-extension/src/extension.js         |    2 +-
 plugins/project-wizard/templates/gtk/src/main.c    |    2 +-
 .../templates/gtkapplication/src/application.c     |    2 +-
 .../templates/gtkapplication/src/application.h     |    2 +-
 .../templates/gtkapplication/src/main.c            |    2 +-
 plugins/project-wizard/templates/gtkmm/src/main.cc |    2 +-
 .../project-wizard/templates/java/src/main.java    |    2 +-
 plugins/project-wizard/templates/library/src/lib.c |    2 +-
 plugins/project-wizard/templates/library/src/lib.h |    2 +-
 plugins/project-wizard/templates/mkfile/src/main.c |    2 +-
 plugins/project-wizard/templates/pygtk/src/main.py |    2 +-
 .../project-wizard/templates/python/src/main.py    |    2 +-
 plugins/project-wizard/templates/sdl/src/main.c    |    2 +-
 .../project-wizard/templates/terminal/src/main.c   |    2 +-
 .../templates/vala-gtk/src/main.vala               |    2 +-
 plugins/project-wizard/templates/wxwin/src/main.cc |    2 +-
 .../project-wizard/templates/xlib-dock/src/main.c  |    2 +-
 .../templates/xlib-dock/src/wmgeneral.c            |    2 +-
 .../templates/xlib-dock/src/wmgeneral.h            |    2 +-
 plugins/project-wizard/templates/xlib/src/main.c   |    2 +-
 24 files changed, 23 insertions(+), 28 deletions(-)
---
diff --git a/plugins/project-wizard/druid.c b/plugins/project-wizard/druid.c
index 9c6f202..3c8a91e 100644
--- a/plugins/project-wizard/druid.c
+++ b/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);
 
diff --git a/plugins/project-wizard/templates/anjuta-plugin/src/plugin.c 
b/plugins/project-wizard/templates/anjuta-plugin/src/plugin.c
index c2cd829..3674e38 100644
--- a/plugins/project-wizard/templates/anjuta-plugin/src/plugin.c
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/anjuta-plugin/src/plugin.h 
b/plugins/project-wizard/templates/anjuta-plugin/src/plugin.h
index d9299ec..88c9365 100644
--- a/plugins/project-wizard/templates/anjuta-plugin/src/plugin.h
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/cpp/src/main.cc 
b/plugins/project-wizard/templates/cpp/src/main.cc
index 3faa857..9bb0f56 100644
--- a/plugins/project-wizard/templates/cpp/src/main.cc
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/gnome-shell-extension/src/extension.js 
b/plugins/project-wizard/templates/gnome-shell-extension/src/extension.js
index 785c811..fc9f6fb 100755
--- a/plugins/project-wizard/templates/gnome-shell-extension/src/extension.js
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/gtk/src/main.c b/plugins/project-wizard/templates/gtk/src/main.c
index d7e863c..b1e5c8b 100644
--- a/plugins/project-wizard/templates/gtk/src/main.c
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/gtkapplication/src/application.c 
b/plugins/project-wizard/templates/gtkapplication/src/application.c
index c6672f7..12dfc5a 100644
--- a/plugins/project-wizard/templates/gtkapplication/src/application.c
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/gtkapplication/src/application.h 
b/plugins/project-wizard/templates/gtkapplication/src/application.h
index 44f3061..b0d0de8 100644
--- a/plugins/project-wizard/templates/gtkapplication/src/application.h
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/gtkapplication/src/main.c 
b/plugins/project-wizard/templates/gtkapplication/src/main.c
index db04dce..a9fd8ab 100644
--- a/plugins/project-wizard/templates/gtkapplication/src/main.c
+++ b/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") \+] 
  */
diff --git a/plugins/project-wizard/templates/gtkmm/src/main.cc 
b/plugins/project-wizard/templates/gtkmm/src/main.cc
index 681958e..92c5276 100644
--- a/plugins/project-wizard/templates/gtkmm/src/main.cc
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/java/src/main.java 
b/plugins/project-wizard/templates/java/src/main.java
index e0ce48f..c6c918c 100644
--- a/plugins/project-wizard/templates/java/src/main.java
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/library/src/lib.c 
b/plugins/project-wizard/templates/library/src/lib.c
index 0407e8a..14fff3d 100644
--- a/plugins/project-wizard/templates/library/src/lib.c
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/library/src/lib.h 
b/plugins/project-wizard/templates/library/src/lib.h
index 4b380a3..1cd1c49 100644
--- a/plugins/project-wizard/templates/library/src/lib.h
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/mkfile/src/main.c 
b/plugins/project-wizard/templates/mkfile/src/main.c
index 60b3ee1..90f0885 100644
--- a/plugins/project-wizard/templates/mkfile/src/main.c
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/pygtk/src/main.py 
b/plugins/project-wizard/templates/pygtk/src/main.py
index 461ef58..db9fcd8 100644
--- a/plugins/project-wizard/templates/pygtk/src/main.py
+++ b/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") \+]
 
diff --git a/plugins/project-wizard/templates/python/src/main.py 
b/plugins/project-wizard/templates/python/src/main.py
index 149f762..c236cf0 100644
--- a/plugins/project-wizard/templates/python/src/main.py
+++ b/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") \+]
 
diff --git a/plugins/project-wizard/templates/sdl/src/main.c b/plugins/project-wizard/templates/sdl/src/main.c
index 740049f..b57470a 100644
--- a/plugins/project-wizard/templates/sdl/src/main.c
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/terminal/src/main.c 
b/plugins/project-wizard/templates/terminal/src/main.c
index 60b3ee1..90f0885 100644
--- a/plugins/project-wizard/templates/terminal/src/main.c
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/vala-gtk/src/main.vala 
b/plugins/project-wizard/templates/vala-gtk/src/main.vala
index 268d3a8..f6e9899 100644
--- a/plugins/project-wizard/templates/vala-gtk/src/main.vala
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/wxwin/src/main.cc 
b/plugins/project-wizard/templates/wxwin/src/main.cc
index f0a9738..f0b1cb9 100644
--- a/plugins/project-wizard/templates/wxwin/src/main.cc
+++ b/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") \+]
  */
diff --git a/plugins/project-wizard/templates/xlib-dock/src/main.c 
b/plugins/project-wizard/templates/xlib-dock/src/main.c
index 9119e0d..357543c 100644
--- a/plugins/project-wizard/templates/xlib-dock/src/main.c
+++ b/plugins/project-wizard/templates/xlib-dock/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") \+]
  */
diff --git a/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.c 
b/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.c
index 5303d8f..e135480 100644
--- a/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.c
+++ b/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.c
@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * wmgeneral.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") \+]
  */
diff --git a/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.h 
b/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.h
index 483024a..2cec37c 100644
--- a/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.h
+++ b/plugins/project-wizard/templates/xlib-dock/src/wmgeneral.h
@@ -5,7 +5,7 @@
 [+INVOKE START-INDENT\+]
 /*
  * wmgeneral.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") \+]
  */
diff --git a/plugins/project-wizard/templates/xlib/src/main.c 
b/plugins/project-wizard/templates/xlib/src/main.c
index 852a493..617f028 100644
--- a/plugins/project-wizard/templates/xlib/src/main.c
+++ b/plugins/project-wizard/templates/xlib/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") \+]
  */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]