Changeset f60b417

Timestamp:

Jul 20, 2011, 4:42:29 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

d8f22b6 (diff), ac919d96 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge ac919d96a68d7391f70c2a23255449d5f0b686fd into d8f22b65abfc43c50c273302ba9cffe7dc383ed0

Files:

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

cmd.c

@@ -260 +260 @@
   if (cmd->usage && *cmd->usage) {
     s = cmd->usage;
-    indent = owl_text_indent(s, OWL_TAB);
+    indent = owl_text_indent(s, OWL_TAB, true);
     owl_fmtext_append_bold(fm, "\nSYNOPSIS\n");
     owl_fmtext_append_normal(fm, indent);
@@ -274 +274 @@
   if (cmd->description && *cmd->description) {
     s = cmd->description;
-    indent = owl_text_indent(s, OWL_TAB);
+    indent = owl_text_indent(s, OWL_TAB, true);
     owl_fmtext_append_bold(fm, "\nDESCRIPTION\n");
     owl_fmtext_append_normal(fm, indent);

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) {

style.c

@@ -65 +65 @@
 
   /* indent and ensure ends with a newline */
-  indent = owl_text_indent(body, OWL_TAB);
+  indent = owl_text_indent(body, OWL_TAB, true);
   curlen = strlen(indent);
   if (curlen == 0 || indent[curlen-1] != '\n') {

text.c

@@ -7 +7 @@
 /* Returns a copy of 'in' with each line indented 'n'
  * characters. Result must be freed with g_free. */
-CALLER_OWN char *owl_text_indent(const char *in, int n)
+CALLER_OWN char *owl_text_indent(const char *in, int n, bool indent_first_line)
 {
   const char *ptr1, *ptr2, *last;
   GString *out = g_string_new("");
   int i;
+  bool indent_this_line = indent_first_line;
 
   last=in+strlen(in)-1;
   ptr1=in;
   while (ptr1<=last) {
-    for (i=0; i<n; i++) {
-      g_string_append_c(out, ' ');
-    }
+    if (indent_this_line) {
+      for (i = 0; i < n; i++) {
+        g_string_append_c(out, ' ');
+      }
+    }
+    indent_this_line = true;
     ptr2=strchr(ptr1, '\n');
     if (!ptr2) {