Changeset 09489b89 for message.c

Timestamp:

Jul 2, 2003, 6:15:24 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

373b7e7

Parents:

7c9c847

Message:

First pass at making owl build without zephyr

File:

• message.c (modified) (11 diffs)

message.c

@@ -1 @@
-#include <zephyr/zephyr.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -434 +433 @@
   return(&(m->notice));
 }
+#else
+void *owl_message_get_notice(owl_message *m)
+{
+  return(NULL);
+}
 #endif
 
@@ -473 +477 @@
     if (strcasecmp(owl_message_get_class(m), "message")) return(0);
     if (strcasecmp(owl_message_get_instance(m), "personal")) return(0);
-    if (!strcasecmp(owl_message_get_recipient(m), ZGetSender()) ||
-        !strcasecmp(owl_message_get_sender(m), ZGetSender())) {
+    if (!strcasecmp(owl_message_get_recipient(m), owl_zephyr_get_sender()) ||
+        !strcasecmp(owl_message_get_sender(m), owl_zephyr_get_sender())) {
       return(1);
     }
@@ -484 +488 @@
 {
   if (owl_message_is_type_zephyr(m)) {
-    if (!strcasecmp(owl_message_get_sender(m), ZGetSender())) {
+    if (!strcasecmp(owl_message_get_sender(m), owl_zephyr_get_sender())) {
       return(1);
     } else {
@@ -534 +538 @@
 
   if (owl_message_is_type_zephyr(m)) {
-    strcpy(sender, ZGetSender());
+    strcpy(sender, owl_zephyr_get_sender());
     ptr=strchr(sender, '@');
     if (ptr) *ptr='\0';
@@ -620 +624 @@
 }
 
+#ifdef HAVE_LIBZEPHYR
 void owl_message_create_from_znotice(owl_message *m, ZNotice_t *n)
 {
@@ -654 +659 @@
     owl_message_set_realm(m, ptr+1);
   } else {
-    owl_message_set_realm(m, ZGetRealm());
+    owl_message_set_realm(m, owl_zephyr_get_realm());
   }
 
@@ -667 +672 @@
 
   /* is the "isprivate" attribute if it's a private zephyr */
-  if (!strcasecmp(n->z_recipient, ZGetSender())) {
+  if (!strcasecmp(n->z_recipient, owl_zephyr_get_sender())) {
     owl_message_set_isprivate(m);
   }
@@ -716 +721 @@
   m->time[strlen(m->time)-1]='\0';
 }
+#else
+void owl_message_create_from_znotice(owl_message *m, void *n)
+{
+}
+#endif
 
 void owl_message_create_from_zwriteline(owl_message *m, char *line, char *body, char *zsig)
@@ -730 +740 @@
   owl_message_set_direction_out(m);
   owl_message_set_type_zephyr(m);
-  owl_message_set_sender(m, ZGetSender());
+  owl_message_set_sender(m, owl_zephyr_get_sender());
   owl_message_set_class(m, owl_zwrite_get_class(&z));
   owl_message_set_instance(m, owl_zwrite_get_instance(&z));
@@ -765 +775 @@
   int i, j;
   owl_pair *p;
-    
+#ifdef HAVE_LIBZEPHYR    
   if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
     ZFreeNotice(&(m->notice));
   }
+#endif
   if (m->time) owl_free(m->time);
   if (m->zwriteline) owl_free(m->zwriteline);