[Gpa-commits] r988 - trunk/src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-04-27 10:43:21 +0200 (Mon, 27 Apr 2009)
New Revision: 988

Modified:
   trunk/src/ChangeLog
   trunk/src/cm-netkey.c
   trunk/src/cm-openpgp.c
   trunk/src/helpmenu.c
Log:
about dialog cleanups.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-04-26 18:32:23 UTC (rev 987)
+++ trunk/src/ChangeLog	2009-04-27 08:43:21 UTC (rev 988)
@@ -1,3 +1,8 @@
+2009-04-27  Werner Koch  <wk at g10code.com>
+
+	* helpmenu.c (gpa_help_about): Link directly to the GPA page.  Use
+	the same dialog for W32 and !W32.  
+
 2009-04-26  Moritz  <moritz at gnu.org>
 
 	* options.c (determine_default_key): Replaced dummy code with

Modified: trunk/src/cm-netkey.c
===================================================================
--- trunk/src/cm-netkey.c	2009-04-26 18:32:23 UTC (rev 987)
+++ trunk/src/cm-netkey.c	2009-04-27 08:43:21 UTC (rev 988)
@@ -466,7 +466,7 @@
     { NULL }
   };
   int attridx;
-  gpg_error_t err;
+  gpg_error_t err = 0;
   char command[100];
   struct scd_getattr_parm parm;
   gpgme_ctx_t gpgagent;
@@ -540,7 +540,6 @@
   if (!line)
     {
       /* We are finished with the command.  */
-      g_debug ("learn_keys_gpg_status_cb: cleanup");
       /* Trigger a reload of the key data.  */
       g_object_ref (parm->card);
       g_idle_add (reload_more_data_idle_cb, parm->card);
@@ -552,7 +551,6 @@
       return FALSE; /* (The return code does not matter here.)  */
     }
 
-  g_debug ("learn_keys_gpg_status_cb: `%s'", line);
   if (!strncmp (line, "PROGRESS", 8))
     gtk_progress_bar_pulse (parm->pbar);
 
@@ -571,7 +569,6 @@
 
   parm = xcalloc (1, sizeof *parm);
 
-  g_debug ("learn keys clicked");
   gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
   widget = gtk_bin_get_child (GTK_BIN (button));
   if (widget)

Modified: trunk/src/cm-openpgp.c
===================================================================
--- trunk/src/cm-openpgp.c	2009-04-26 18:32:23 UTC (rev 987)
+++ trunk/src/cm-openpgp.c	2009-04-27 08:43:21 UTC (rev 988)
@@ -799,7 +799,7 @@
 
 /* Callback for the "changed" signal connected to entry fields.  We
    figure out the entry field for which this signal has been emitted
-   and set a flag to know ehether we have unsaved data.  */
+   and set a flag to know wether we have unsaved data.  */
 static void
 edit_changed_cb (GtkEditable *editable, void *opaque)
 {

Modified: trunk/src/helpmenu.c
===================================================================
--- trunk/src/helpmenu.c	2009-04-26 18:32:23 UTC (rev 987)
+++ trunk/src/helpmenu.c	2009-04-27 08:43:21 UTC (rev 988)
@@ -68,12 +68,10 @@
     "Copyright \xc2\xa9 2000-2002 G-N-U GmbH\n"
     "Copyright \xc2\xa9 2002-2003 Miguel Coca\n"
     "Copyright \xc2\xa9 2005-2008 g10 Code GmbH";
-#ifdef HAVE_W32_SYSTEM
-  static const gchar website[] = "http://www.gpg4win.org/";
-#else
-  static const gchar website[] = "http://www.gnupg.org/";
-#endif
+  static const gchar website[] = "http://www.gnupg.org/related_software/gpa/";
+  static const gchar website_label[] = "www.gnupg.org";
 
+
   GdkPixbuf *logo;
 
   logo = gpa_create_icon_pixbuf ("gpa_logo");
@@ -84,6 +82,7 @@
 			 /* Only clickable if
 			    gtk_about_dialog_set_url_hook() is
 			    used.  */
+                         "website-label", website_label,
 			 "website", website,
 			 "copyright", copyright,
 			 "comments", _("GPA is the GNU Privacy Assistant."),