[svn] gpgme - r1265 - in trunk: . doc gpgme

[svn author marcus]

Author: marcus
Date: 2007-09-27 14:17:24 +0200 (Thu, 27 Sep 2007)
New Revision: 1265

Modified:
   trunk/ChangeLog
   trunk/doc/ChangeLog
   trunk/doc/gpgme.texi
   trunk/gpgme/ChangeLog
   trunk/gpgme/gpgme.c
   trunk/gpgme/gpgme.h
Log:
doc/
2007-09-27  Marcus Brinkmann  <marcus at g10code.de>

	* gpgme.texi (Protocols and Engines): Document GPGME_PROTOCOL_UNKNOWN.

gpgme/
2007-09-27  Marcus Brinkmann  <marcus at g10code.de>

	* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_UNKNOWN.
	* gpgme.c (gpgme_get_protocol_name): Implement support for
	GPGME_PROTOCOL_UNKNOWN.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-27 11:55:18 UTC (rev 1264)
+++ trunk/ChangeLog	2007-09-27 12:17:24 UTC (rev 1265)
@@ -1,5 +1,7 @@
 2007-09-27  Marcus Brinkmann  <marcus at g10code.de>
 
+	* assuan-pipe-connect.c (pipe_connect_gpgme): Fix last change.
+
 	* assuan-pipe-connect.c (pipe_connect_gpgme): New function, use it
 	if _ASSUAN_IN_GPGME_BUILD_ASSUAN.
 

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2007-09-27 11:55:18 UTC (rev 1264)
+++ trunk/doc/ChangeLog	2007-09-27 12:17:24 UTC (rev 1265)
@@ -1,3 +1,7 @@
+2007-09-27  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpgme.texi (Protocols and Engines): Document GPGME_PROTOCOL_UNKNOWN.
+
 2007-09-11  Werner Koch  <wk at g10code.com>
 
 	* gpgme.texi (I/O Callback Example): Typo fix.

Modified: trunk/doc/gpgme.texi
===================================================================
--- trunk/doc/gpgme.texi	2007-09-27 11:55:18 UTC (rev 1264)
+++ trunk/doc/gpgme.texi	2007-09-27 12:17:24 UTC (rev 1265)
@@ -748,6 +748,12 @@
 
 @item GPGME_PROTOCOL_CMS
 This specifies the Cryptographic Message Syntax.
+
+ at item GPGME_PROTOCOL_UNKNOWN
+Reserved for future extension.  You may use this to indicate that the
+used protocol is not known to the application.  Currently,
+ at acronym{GPGME} does not accept this value in any operation, though,
+except for @code{gpgme_get_protocol_name}.
 @end table
 @end deftp
 

Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2007-09-27 11:55:18 UTC (rev 1264)
+++ trunk/gpgme/ChangeLog	2007-09-27 12:17:24 UTC (rev 1265)
@@ -1,5 +1,9 @@
 2007-09-27  Marcus Brinkmann  <marcus at g10code.de>
 
+	* gpgme.h (gpgme_protocol_t): Add GPGME_PROTOCOL_UNKNOWN.
+	* gpgme.c (gpgme_get_protocol_name): Implement support for
+	GPGME_PROTOCOL_UNKNOWN.
+
 	* kdpipeiodevice.h: Fix last change.
 
 	* w32-glib-io.c (_gpgme_io_pipe), w32-qt-io.c (_gpgme_io_pipe),

Modified: trunk/gpgme/gpgme.c
===================================================================
--- trunk/gpgme/gpgme.c	2007-09-27 11:55:18 UTC (rev 1264)
+++ trunk/gpgme/gpgme.c	2007-09-27 12:17:24 UTC (rev 1265)
@@ -208,6 +208,9 @@
     case GPGME_PROTOCOL_CMS:
       return "CMS";
 
+    case GPGME_PROTOCOL_UNKNOWN:
+      return "unknown";
+
     default:
       return NULL;
     }

Modified: trunk/gpgme/gpgme.h
===================================================================
--- trunk/gpgme/gpgme.h	2007-09-27 11:55:18 UTC (rev 1264)
+++ trunk/gpgme/gpgme.h	2007-09-27 12:17:24 UTC (rev 1265)
@@ -300,7 +300,8 @@
 typedef enum
   {
     GPGME_PROTOCOL_OpenPGP = 0,  /* The default mode.  */
-    GPGME_PROTOCOL_CMS     = 1
+    GPGME_PROTOCOL_CMS     = 1,
+    GPGME_PROTOCOL_UNKNOWN = 255
   }
 gpgme_protocol_t;