less and less cruft: always compile socket support in

[apps/madmutt.git] / hook.c

diff --git a/hook.c b/hook.c
index fb74206..4eb6e01 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -20,10 +20,7 @@
 #include "mutt.h"
 #include "mx.h"
 #include "mutt_crypt.h"
-
-#ifdef USE_COMPRESSED
 #include "compress.h"
-#endif
 
 #include "lib/rx.h"
 
@@ -94,17 +91,15 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s, unsigned
     p_clear(&pattern, 1);
     pattern.data = m_strdup(path);
   }
-#ifdef USE_COMPRESSED
   else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) {
     if (mutt_test_compress_command (command.data)) {
       m_strcpy(err->data, err->dsize, _("bad formatted command string"));
       return (-1);
     }
   }
-#endif
   else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
-           && (!WithCrypto || !(data & M_CRYPTHOOK))
-    ) {
+           && !(data & M_CRYPTHOOK))
+  {
     char tmp[HUGE_STRING];
 
     m_strcpy(tmp, sizeof(tmp), pattern.data);
@@ -445,7 +440,6 @@ char *mutt_crypt_hook (address_t * adr)
   return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);
 }
 
-#ifdef USE_SOCKET
 void mutt_account_hook (const char *url)
 {
   HOOK *hook;
@@ -476,4 +470,3 @@ void mutt_account_hook (const char *url)
 
   p_delete(&token.data);
 }
-#endif