Minor GUI fixes.

[gpgol.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 3f2375d..fbcc53b 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -118,6 +118,7 @@ struct
   int enable_default_key;    /* Enable the use of DEFAULT_KEY. */
   int preview_decrypt;       /* Decrypt in preview window. */
   int prefer_html;           /* Prefer html in html/text alternatives. */
+  int body_as_attachment;    /* Present encrypted message as attachment.  */
 
   /* The compatibility flags. */
   struct 
@@ -130,6 +131,17 @@ struct
     unsigned int auto_decrypt: 1;   /* Try to decrypt when clicked. */
     unsigned int no_attestation: 1; /* Don't create an attestation. */
   } compat; 
+
+  /* The SVN revision as stored in the registry.  */
+  int svn_revision; 
+
+  /* The SVN revision of the the binary used to install the forms.  */
+  int forms_revision;
+
+  /* Disable message processing until restart.  This is required to
+     implement message reverting as a perparation to remove GpgOL.  */
+  int disable_gpgol;
+
 } opt;
 
 
@@ -145,11 +157,17 @@ typedef struct b64_state_s b64_state_t;
 
 /* Bit values used for extra log file verbosity.  Value 1 is reserved
    to enable debug menu options.  */
-#define DBG_IOWORKER        2
-#define DBG_IOWORKER_EXTRA  4
-#define DBG_FILTER          8
-#define DBG_FILTER_EXTRA   16 
-#define DBG_MEMORY         32
+#define DBG_IOWORKER       (1<<1)
+#define DBG_IOWORKER_EXTRA (1<<2) 
+#define DBG_FILTER         (1<<3)
+#define DBG_FILTER_EXTRA   (1<<4) 
+#define DBG_MEMORY         (1<<5)
+#define DBG_COMMANDS       (1<<6)
+#define DBG_MIME_PARSER    (1<<7)
+#define DBG_MIME_DATA      (1<<8)
+
+/* Macros to used in conditionals to enable debug output.  */
+#define debug_commands    (opt.enable_debug & DBG_COMMANDS)
 
 
 /* Type and constants used with parse_tlv.  */
@@ -180,8 +198,9 @@ char *get_save_filename (HWND root, const char *srcname);
 char *utf8_to_wincp (const char *string);
 
 const char *default_homedir (void);
+char *get_data_dir (void);
 
-size_t qp_decode (char *buffer, size_t length);
+size_t qp_decode (char *buffer, size_t length, int *r_slbrk);
 void b64_init (b64_state_t *state);
 size_t b64_decode (b64_state_t *state, char *buffer, size_t length);
 
@@ -210,7 +229,6 @@ const char *get_pubkey_algo_str (gpgme_pubkey_algo_t id);
 
 /*-- config-dialog.c --*/
 void config_dialog_box (HWND parent);
-int start_key_manager (void);
 int store_extension_value (const char *key, const char *val);
 int load_extension_value (const char *key, char **val);