X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap.c;h=48f1dc4cc1c5ee46bdd97b4572599be8496d92f8;hp=4b004f17062aa885cefea1ea406c2e0ed4338acb;hb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a;hpb=c8bf978fc5c4f6c793620a515fa2456a3fa9eb13

diff --git a/imap/imap.c b/imap/imap.c
index 4b004f1..48f1dc4 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -19,6 +19,7 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/buffer.h>
+#include <lib-lib/debug.h>
 
 #include "mutt.h"
 #include "mx.h"
@@ -28,12 +29,11 @@
 #include "message.h"
 #include "imap_private.h"
 #if defined(USE_SSL) || defined(USE_GNUTLS)
-# include "mutt_ssl.h"
+# include <lib-network/mutt_ssl.h>
 #endif
 #include "buffy.h"
 
 #include <lib-lib/macros.h>
-#include "lib/debug.h"
 
 #include <unistd.h>
 #include <ctype.h>
@@ -904,7 +904,7 @@ int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd,
   if (mutt_bit_isset (idata->rights, ACL_WRITE))
     imap_add_keywords (flags, hdr, idata->flags, sizeof (flags));
 
-  str_skip_trailws (flags);
+  m_strrtrim(flags);
 
   /* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to
    * explicitly revoke all system flags (if we have permission) */
@@ -915,7 +915,7 @@ int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd,
     imap_set_flag (idata, ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags));
     imap_set_flag (idata, ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags));
 
-    str_skip_trailws (flags);
+    m_strrtrim(flags);
 
     mutt_buffer_addstr (cmd, " -FLAGS.SILENT (");
   } else