[Gpa-commits] r744 - trunk/src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-02-28 17:41:22 +0100 (Tue, 28 Feb 2006)
New Revision: 744

Modified:
   trunk/src/ChangeLog
   trunk/src/keygenwizard.c
Log:
2006-02-28  Marcus Brinkmann  <marcus at g10code.de>

	* keygenwizard.c: Remove comment_page.
	(gpa_keygen_wizard_comment_page): Function removed.
	(gpa_keygen_wizard_generate_action): Do not free params.comment.
	(gpa_keygen_wizard_new): Do not add comment page.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-02-28 10:29:35 UTC (rev 743)
+++ trunk/src/ChangeLog	2006-02-28 16:41:22 UTC (rev 744)
@@ -1,5 +1,10 @@
 2006-02-28  Marcus Brinkmann  <marcus at g10code.de>
 
+	* keygenwizard.c: Remove comment_page.
+	(gpa_keygen_wizard_comment_page): Function removed.
+	(gpa_keygen_wizard_generate_action): Do not free params.comment.
+	(gpa_keygen_wizard_new): Do not add comment page.
+
 	* gpa.c (main): Create default config directory if it doesn't
 	exist.
 

Modified: trunk/src/keygenwizard.c
===================================================================
--- trunk/src/keygenwizard.c	2006-02-28 10:29:35 UTC (rev 743)
+++ trunk/src/keygenwizard.c	2006-02-28 16:41:22 UTC (rev 744)
@@ -66,7 +66,6 @@
   GtkWidget * wizard;
   GtkWidget * name_page;
   GtkWidget * email_page;
-  GtkWidget * comment_page;
   GtkWidget * passwd_page;
   GtkWidget * wait_page;
   GtkWidget * final_page;
@@ -213,21 +212,6 @@
 }
 
 
-static GtkWidget *
-gpa_keygen_wizard_comment_page (GPAKeyGenWizard * keygen_wizard)
-{
-  return gpa_keygen_wizard_simple_page
-    (keygen_wizard,
-     _("If you want you can supply a comment that further identifies"
-       " the key to other users."
-       " The comment is especially useful if you generate several keys"
-       " for the same email address."
-       " The comment is completely optional."
-       " Leave it empty if you don't have a use for it."),
-     _("Comment:"));
-}
-
-
 /* Handler for the activate signal of the passphrase entry. Focus the
  * repeat passhrase entry. */
 static void
@@ -447,8 +431,6 @@
   /* The User ID */
   params.userID = gpa_keygen_wizard_simple_get_text (keygen_wizard->name_page);
   params.email = gpa_keygen_wizard_simple_get_text (keygen_wizard->email_page);
-  params.comment = gpa_keygen_wizard_simple_get_text (keygen_wizard
-                                                      ->comment_page);
   params.password = gpa_keygen_wizard_password_get_password (keygen_wizard
                                                              ->passwd_page);
 
@@ -469,7 +451,6 @@
 
   g_free (params.userID);
   g_free (params.email);
-  g_free (params.comment);
 
   return FALSE;
 }
@@ -585,10 +566,6 @@
 			  FALSE,
 			  gpa_keygen_wizard_email_validate, keygen_wizard);
 
-  keygen_wizard->comment_page = gpa_keygen_wizard_comment_page (keygen_wizard);
-  gpa_wizard_append_page (wizard, keygen_wizard->comment_page,
-			  FALSE, NULL, NULL);
-			  
   keygen_wizard->passwd_page = gpa_keygen_wizard_password_page (keygen_wizard);
   gpa_wizard_append_page (wizard, keygen_wizard->passwd_page,
 			  FALSE, gpa_keygen_wizard_password_validate,