gpg: Consistent use of preprocessor conditionals.
[gnupg.git] / g10 / call-dirmngr.c
index 2f2ba98..aa39155 100644 (file)
 
 #include "gpg.h"
 #include <assuan.h>
-#include "util.h"
-#include "membuf.h"
+#include "../common/util.h"
+#include "../common/membuf.h"
 #include "options.h"
-#include "i18n.h"
-#include "asshelp.h"
-#include "keyserver.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/asshelp.h"
+#include "../common/keyserver.h"
+#include "../common/status.h"
 #include "call-dirmngr.h"
 
 
@@ -987,9 +987,9 @@ ks_put_inq_cb (void *opaque, const char *line)
                    int i;
 
                    i = 0;
-                   if (uid->is_revoked)
+                   if (uid->flags.revoked)
                      validity[i ++] = 'r';
-                   if (uid->is_expired)
+                   if (uid->flags.expired)
                      validity[i ++] = 'e';
                    validity[i] = '\0';