Changeset 6500907

Timestamp:

Jul 21, 2011, 5:12:15 PM (14 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

f661cee, 092806c

Parents:

14be3a5

git-author:

Jason Gross <jgross@mit.edu> (07/20/11 02:55:11)

git-committer:

Jason Gross <jgross@mit.edu> (07/21/11 17:12:15)

Message:

Correctly display multiline fields in :info

Commit 259e60a8abc2d2d41bc7a484b02a334fdd13857f removed the length limit
on :info, but kept the replacement of '\n' with '~' and '\r' with '!'.
This replacement came with the initial commit, with a comment of "/*
just for testing for now */".  This commit does away with that
replacement, and indents the fields for display purposes.

This is particularly useful for messages that have very long fields,
such as the original xml field for jabber messages.

Trailing newlines (e.g., in formats or in the message body) are doubled,
because the code is simpler that way, and because I don't see a
compelling reason to strip them.

Files:

• functions.c (modified) (2 diffs)
• message.c (modified) (1 diff)

functions.c

@@ -1430 +1430 @@
 #ifdef HAVE_LIBZEPHYR
     if (owl_message_is_direction_in(m)) {
-      char *tmpbuff;
+      char *tmpbuff, *tmpbuff2;
       int i, fields;
 
@@ -1476 +1476 @@
 
         for (i = 0; i < fields; i++) {
-          tmpbuff = owl_zephyr_get_field_as_utf8(n, i + 1);
-
-          g_strdelimit(tmpbuff, "\n", '~');
-          g_strdelimit(tmpbuff, "\r", '!');
-
-          owl_fmtext_appendf_normal(&fm, "  Field %i   : %s\n", i + 1, tmpbuff);
-          g_free(tmpbuff);
+          tmpbuff = owl_zephyr_get_field_as_utf8(n, i + 1);
+          tmpbuff2 = owl_text_indent(tmpbuff, 14, false);
+          owl_fmtext_appendf_normal(&fm, "  Field %i   : %s\n", i + 1, tmpbuff2);
+          g_free(tmpbuff2);
+          g_free(tmpbuff);
         }
-        owl_fmtext_appendf_normal(&fm, "  Default Fm: %s\n", n->z_default_format);
+        tmpbuff = owl_text_indent(n->z_default_format, 14, false);
+        owl_fmtext_appendf_normal(&fm, "  Default Fm: %s\n", tmpbuff);
+        g_free(tmpbuff);
       }
 

message.c

@@ -125 +125 @@
     p = m->attributes->pdata[i];
 
-    tmpbuff = g_strdup(owl_pair_get_value(p));
-    g_strdelimit(tmpbuff, "\n", '~');
-    g_strdelimit(tmpbuff, "\r", '!');
-    buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), tmpbuff);
-    g_free(tmpbuff);
+    buff = g_strdup(owl_pair_get_value(p));
+    if (buff) {
+      tmpbuff = owl_text_indent(buff, 19, false);
+      g_free(buff);
+      buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), tmpbuff);
+      g_free(tmpbuff);
+    }
 
     if(buff == NULL) {