[svn] GnuPG - r3903 - in trunk: g10 po

[svn author wk]

Author: wk
Date: 2005-10-06 12:38:23 +0200 (Thu, 06 Oct 2005)
New Revision: 3903

Modified:
   trunk/g10/export.c
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
Log:
Yet another fix for the gpg.c rename


Modified: trunk/g10/export.c
===================================================================
--- trunk/g10/export.c	2005-10-05 18:22:36 UTC (rev 3902)
+++ trunk/g10/export.c	2005-10-06 10:38:23 UTC (rev 3903)
@@ -340,7 +340,22 @@
 		  default:
 		    break;
 		  }
+                
+                /* XXX: before skipping a subkey, check whether any
+                   other description wants an exact macth on a subkey
+                   and include that subkey into the output too.  Need
+                   to add this subkey to a list so that it won't get
+                   processed a second time. 
+                   
+                   So the first step here is to check that list and
+                   skip in any case if the key is in that list.
 
+                   We need this whole mess becuase the import fnction
+                   is not able to merge secret key and thus it is not
+                   possible to output them as two keys and have import
+                   merge them.
+                  */
+
 		if(skip_until_subkey)
 		  continue;
 	      }

Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2005-10-05 18:22:36 UTC (rev 3902)
+++ trunk/po/ChangeLog	2005-10-06 10:38:23 UTC (rev 3903)
@@ -1,3 +1,7 @@
+2005-10-06  Werner Koch  <wk at g10code.com>
+
+	* POTFILES.in: s/g10.c/gpg.c/.
+
 2005-07-26  Werner Koch  <wk at g10code.com>
 
 	* zh_TW.po, fr.po, cs.po: Updated.

Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2005-10-05 18:22:36 UTC (rev 3902)
+++ trunk/po/POTFILES.in	2005-10-06 10:38:23 UTC (rev 3903)
@@ -19,7 +19,7 @@
 g10/encr-data.c
 g10/exec.c
 g10/export.c
-g10/g10.c
+g10/gpg.c
 g10/getkey.c
 g10/gpgv.c
 g10/helptext.c