2003-01-30 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 30 Jan 2003 17:28:10 +0000 (17:28 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 30 Jan 2003 17:28:10 +0000 (17:28 +0000)
* types.h (EngineObject): Move typedef to ...
* engine.h: ... here.
* types.h (GpgObject): Move typedef to ...
* rungpg.c: ... here.
* types.h (GpgsmObject): Move typedef to ...
* engine-gpgsm.c: ... here.

gpgme/ChangeLog
gpgme/engine-gpgsm.c
gpgme/engine.h
gpgme/rungpg.c
gpgme/types.h

index f6692e3..e309509 100644 (file)
@@ -1,5 +1,12 @@
 2003-01-30  Marcus Brinkmann  <marcus@g10code.de>
 
+       * types.h (EngineObject): Move typedef to ...
+       * engine.h: ... here.
+       * types.h (GpgObject): Move typedef to ...
+       * rungpg.c: ... here.
+       * types.h (GpgsmObject): Move typedef to ...
+       * engine-gpgsm.c: ... here.
+
        * util.h (return_if_fail, return_null_if_fail,
        return_val_if_fail): Remove macro.
        * gpgme.c (gpgme_cancel): Don't use return_if_fail.
index 38c2c0f..82d719a 100644 (file)
@@ -97,7 +97,9 @@ struct gpgsm_object_s
   struct GpgmeIOCbs io_cbs;
 };
 
+typedef struct gpgsm_object_s *GpgsmObject;
 
+\f
 static const char *
 gpgsm_get_version (void)
 {
index de782da..a56ec85 100644 (file)
@@ -23,6 +23,9 @@
 
 #include "types.h"
  
+struct engine_object_s;
+typedef struct engine_object_s *EngineObject;
+
 GpgmeError _gpgme_engine_new (GpgmeProtocol proto, EngineObject *r_engine);
 void _gpgme_engine_release (EngineObject engine);
 void _gpgme_engine_set_status_handler (EngineObject engine,
index ca1cb0b..2b0e4d3 100644 (file)
@@ -123,7 +123,9 @@ struct gpg_object_s
   struct GpgmeIOCbs io_cbs;
 };
 
+typedef struct gpg_object_s *GpgObject;
 
+\f
 static void
 gpg_io_event (void *engine, GpgmeEventIO type, void *type_data)
 {
index 30ed724..90d7129 100644 (file)
@@ -32,18 +32,6 @@ typedef GpgmeError (*GpgmeCommandHandler) (void*, GpgmeStatusCode code,
                                           const char *keyword, const char **result);
 
 
-/*-- engine.c --*/
-struct engine_object_s;
-typedef struct engine_object_s *EngineObject;
-
-/*-- engine-gpgsm.c --*/
-struct gpgsm_object_s;
-typedef struct gpgsm_object_s *GpgsmObject;
-
-/*-- rungpg.c --*/
-struct gpg_object_s;
-typedef struct gpg_object_s *GpgObject;
-
 /*-- verify.c --*/
 struct verify_result_s;
 typedef struct verify_result_s *VerifyResult;