[Winpt-commits] r118 - in trunk: . Po Src

[scm-commit at wald.intevation.org]

Author: twoaday
Date: 2005-12-08 14:21:52 +0100 (Thu, 08 Dec 2005)
New Revision: 118

Modified:
   trunk/NEWS
   trunk/Po/de.po
   trunk/Src/ChangeLog
   trunk/Src/wptKeyserverDlg.cpp
Log:
2005-12-08  Timo Schulz  <ts at g10code.com>
 
        * wptKeyserverDlg.cpp (show_imported_keys): Enhanced.
        (hkp_recv_key2): Show user-id of the imported key instead
        of just the pattern.
         


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2005-12-08 09:26:32 UTC (rev 117)
+++ trunk/NEWS	2005-12-08 13:21:52 UTC (rev 118)
@@ -685,3 +685,6 @@
 * Initialize gettext early as possible to avoid that
   greeting messages are still in English.
 * Do not register file extensions if GPGee is available.
+* Backup to home path will now use the correct directory
+  ($APPDATA) and not the folder where gpg.exe is located.
+  
\ No newline at end of file

Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2005-12-08 09:26:32 UTC (rev 117)
+++ trunk/Po/de.po	2005-12-08 13:21:52 UTC (rev 118)
@@ -1448,19 +1448,18 @@
 msgid "Key &type"
 msgstr "Schlüssel &Typ"
 
-#, c-format
-msgid "Key '%s' successfully received but nothing was changed."
+
+msgid "Key(s) successfully received but nothing was changed."
 msgstr ""
-"Schlüssel '%s' erfolgreich empfangen, aber keine Änderungen durchgeführt."
+"Schlüssel erfolgreich empfangen, aber keine Änderungen durchgeführt."
 
+msgid "Key(s) sucessfully received and imported."
+msgstr "Schlüssel erfolgreich empfangen und importiert."
+
 #, c-format
 msgid "Key '%s' successfully sent"
 msgstr "Schlüssel '%s' erfolgreich versendet"
 
-#, c-format
-msgid "Key '%s' sucessfully received and imported."
-msgstr "Schlüssel '%s' erfolgreich empfangen und importiert."
-
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
 msgid "Key Attributes"
 msgstr "Schlüsselattribute"
@@ -3258,7 +3257,6 @@
 msgid "Add Photo ID"
 msgstr "Photo ID hinzufügen"
 
-
 msgid "&Find"
 msgstr "&Suche"
 

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2005-12-08 09:26:32 UTC (rev 117)
+++ trunk/Src/ChangeLog	2005-12-08 13:21:52 UTC (rev 118)
@@ -1,3 +1,9 @@
+2005-12-08  Timo Schulz  <ts at g10code.com>
+
+	* wptKeyserverDlg.cpp (show_imported_keys): Enhanced.
+	(hkp_recv_key2): Show user-id of the imported key instead
+	of just the pattern.
+	
 2005-12-07  Timo Schulz  <ts at g10code.com>
 
 	* wptOwnertrustDlg.cpp (ownertrust_dlg_proc): 

Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp	2005-12-08 09:26:32 UTC (rev 117)
+++ trunk/Src/wptKeyserverDlg.cpp	2005-12-08 13:21:52 UTC (rev 118)
@@ -103,8 +103,7 @@
 
 
 
-/* If the keyserver returned one than more key in a
-   keyblob, show the names of all imported keys. */
+/* Show all received keys from the keyserver. */
 static void
 show_imported_keys (gpgme_import_result_t res)
 {
@@ -117,14 +116,27 @@
     char *p;
     size_t n=0;
 
+    if (!res)
+	return;
+
     err = gpgme_data_new (&msg);
     if (err)
 	BUG (NULL);
     err = gpgme_new (&ctx);
     if (err)
 	BUG (NULL);
-    s = _("WARNING: multiple keys matched request.\n\n");
+    if (res->considered > 1) {
+	s = _("WARNING: multiple keys matched request.\n\n");
+	gpgme_data_write (msg, s, strlen (s));
+    }
+
+    if (res->unchanged == res->considered)
+	s = _("Key(s) successfully received but nothing was changed.");
+    else
+	s = _("Key(s) sucessfully received and imported.");
     gpgme_data_write (msg, s, strlen (s));
+    gpgme_data_write (msg, "\n\n", 2);
+
     for (t=res->imports; t; t = t->next) {
 	if (!gpgme_get_key (ctx, t->fpr, &key, 0)) {
 	    s = key->uids->uid;
@@ -156,7 +168,6 @@
     gpgme_error_t ec;
     gpgme_import_result_t import_res = NULL;    
     char *rawkey = NULL;
-    char msg[384];
     int rc;
     
     /* XXX: implement dynamic buffers. */
@@ -214,19 +225,13 @@
     /* if we use the refresh mode, a lot of keys will be fetched and thus only
        a summarize at the end is presented and not for each key. */
     if (!(flags & KM_KS_REFRESH)) {
-	if (import_res && import_res->considered > 1)
-	    show_imported_keys (import_res);
+	show_imported_keys (import_res);
 	if (import_res && import_res->unchanged == import_res->considered) {
-	    _snprintf (msg, DIM (msg)-1,
-		       _("Key '%s' successfully received but nothing was changed."), pattern );
-	    status_box (dlg, msg, _("GnuPG Status"));
-	    rc = WPTERR_GENERAL;
+	    rc = WPTERR_GENERAL; /* no keys updated. */
 	    goto leave;
 	}
-	_snprintf (msg, DIM (msg)-1, _("Key '%s' sucessfully received and imported."), pattern);
-	status_box (dlg, msg, _("GnuPG Status"));
     }
-    
+
 leave:
     free_if_alloc (rawkey);
     gpgme_release (ctx);