Changeset 85d1795 for message.c

Timestamp:

Apr 16, 2007, 9:54:27 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

d754b0a

Parents:

1d7e094

Message:

Change special casing rules to refer to default format strings instead
of senders.

File:

• message.c (modified) (2 diffs)

message.c

@@ -851 +851 @@
   m->zwriteline=strdup("");
 
-  /* set the body */
-  tmp=owl_zephyr_get_message(n);
-  if (owl_global_is_newlinestrip(&g)) {
-    tmp2=owl_util_stripnewlines(tmp);
-    owl_message_set_body(m, tmp2);
-    owl_free(tmp2);
-  } else {
-    owl_message_set_body(m, tmp);
-  }
-  owl_free(tmp);
-
-#ifdef OWL_ENABLE_ZCRYPT
-  /* if zcrypt is enabled try to decrypt the message */
-  if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
-    char *out;
-    int ret;
-
-    out=owl_malloc(strlen(owl_message_get_body(m))*16+20);
-    ret=owl_zcrypt_decrypt(out, owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m));
-    if (ret==0) {
-      owl_message_set_body(m, out);
-    } else {
-      owl_free(out);
-    }
-  }
-#endif  
-
   /* save the hostname */
   owl_function_debugmsg("About to do gethostbyaddr");
@@ -886 +859 @@
     owl_message_set_hostname(m, inet_ntoa(n->z_sender_addr));
   }
+
+  /* set the body */
+  tmp=owl_zephyr_get_message(n, m);
+  if (owl_global_is_newlinestrip(&g)) {
+    tmp2=owl_util_stripnewlines(tmp);
+    owl_message_set_body(m, tmp2);
+    owl_free(tmp2);
+  } else {
+    owl_message_set_body(m, tmp);
+  }
+  owl_free(tmp);
+
+#ifdef OWL_ENABLE_ZCRYPT
+  /* if zcrypt is enabled try to decrypt the message */
+  if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
+    char *out;
+    int ret;
+
+    out=owl_malloc(strlen(owl_message_get_body(m))*16+20);
+    ret=owl_zcrypt_decrypt(out, owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m));
+    if (ret==0) {
+      owl_message_set_body(m, out);
+    } else {
+      owl_free(out);
+    }
+  }
+#endif  
 }
 #else