From: Marcus Brinkmann <mb@g10code.com>
Date: Thu, 22 Nov 2001 13:47:46 +0000 (+0000)
Subject: 2001-11-22  Marcus Brinkmann  <marcus@gnu.org>
X-Git-Tag: gpgme-0-3-0~82
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c23a9b5e74f85fb77b126f15a33bd9f29829957a;p=gpgme.git

2001-11-22  Marcus Brinkmann  <marcus@gnu.org>

	* engine-gpgsm.c: Shuffle around header inclusion a bit, to still
	keep them seperate.
	(_gpgme_set_status_handler) [!ENABLE_GPGSM]: New function.
---

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index fb2ab2d..97098b0 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-22  Marcus Brinkmann  <marcus@gnu.org>
+
+	* engine-gpgsm.c: Shuffle around header inclusion a bit, to still
+	keep them seperate.
+	(_gpgme_set_status_handler) [!ENABLE_GPGSM]: New function.
+
 2001-11-22  Werner Koch  <wk@gnupg.org>
 
 	* engine-gpgsm.c: Include more headers so that NULL and mk_error
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index a27b354..0b09f18 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -28,17 +28,17 @@
 #define ENABLE_GPGSM 1
 #endif
 
+#ifdef ENABLE_GPGSM
+
 #include <sys/types.h>
 #include <assert.h>
 
-#ifdef ENABLE_GPGSM
 /* FIXME */
 #include "../assuan/assuan-defs.h"
 #undef xtrymalloc
 #undef xtrycalloc
 #undef xtryrealloc
 #undef xfree
-#endif /*ENABLE_GPGSM*/
 
 #include "gpgme.h"
 #include "util.h"
@@ -47,8 +47,6 @@
 #include "wait.h"
 #include "io.h"
 
-#ifdef ENABLE_GPGSM
-
 #include "engine-gpgsm.h"
 
 #include "assuan.h"
@@ -312,6 +310,11 @@ _gpgme_gpgsm_start (GpgsmObject gpgsm, void *opaque)
 
 #else	/* ENABLE_GPGSM */
 
+#include <stddef.h>
+#include "util.h"
+
+#include "engine-gpgsm.h"
+
 const char *
 _gpgme_gpgsm_get_version (void)
 {
@@ -336,6 +339,13 @@ _gpgme_gpgsm_release (GpgsmObject gpgsm)
   return;
 }
 
+void
+_gpgme_gpgsm_set_status_handler (GpgsmObject gpgsm,
+				 GpgStatusHandler fnc, void *fnc_value) 
+{
+  return;
+}
+
 GpgmeError
  _gpgme_gpgsm_op_verify (GpgsmObject gpgsm, GpgmeData sig, GpgmeData text)
 {