# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1300527497 -3600
# Node ID 10eead2ba1b7ef3ebf52ac2ae31fc6c783b76c36
# Parent  d9255c40802773d15733ae1afc7e5c71142681cb
Fix another readmark issue with line wrapping

diff -r d9255c408027 -r 10eead2ba1b7 mcabber/mcabber/hbuf.c
--- a/mcabber/mcabber/hbuf.c	Fri Mar 18 19:48:34 2011 +0100
+++ b/mcabber/mcabber/hbuf.c	Sat Mar 19 10:38:17 2011 +0100
@@ -322,14 +322,20 @@
 
   // To be able to correctly highlight multi-line messages,
   // we need to look at the last non-null prefix, which should be the first
-  // line of the message.
+  // line of the message.  We also need to check if there's a readmark flag
+  // somewhere in the message.
   last_persist = hbuf_previous_persistent(hbuf);
   while (last_persist) {
     blk = (hbuf_block*)last_persist->data;
-    if ((blk->flags & HBB_FLAG_PERSISTENT) &&
-        (blk->prefix.flags & ~HBB_PREFIX_READMARK)) {
-      last_persist_prefixflags = blk->prefix.flags;
-      break;
+    if ((blk->flags & HBB_FLAG_PERSISTENT) && blk->prefix.flags) {
+      // This can be either the beginning of the message,
+      // or a persistent line with a readmark flag (or both).
+      if (blk->prefix.flags & ~HBB_PREFIX_READMARK) { // First message line
+        last_persist_prefixflags |= blk->prefix.flags;
+        break;
+      } else { // Not the first line, but we need to keep the readmark flag
+        last_persist_prefixflags = blk->prefix.flags;
+      }
     }
     last_persist = g_list_previous(last_persist);
   }
@@ -363,6 +369,10 @@
         // Continuation of a message - omit the prefix
         (*array_elt)->flags |= HBB_PREFIX_CONT;
         (*array_elt)->mucnicklen = 0; // The nick is in the first one
+
+        // If there is a readmark on this line, update last_persist_prefixflags
+        if (blk->flags & HBB_FLAG_PERSISTENT)
+          last_persist_prefixflags |= blk->prefix.flags & HBB_PREFIX_READMARK;
         // Remove readmark flag from the previous line
         if (prev_array_elt && last_persist_prefixflags & HBB_PREFIX_READMARK)
           prev_array_elt->flags &= ~HBB_PREFIX_READMARK;