Changeset 09489b89 for stylefunc.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:

• stylefunc.c (modified) (12 diffs)

stylefunc.c

@@ -9 +9 @@
 void owl_stylefunc_basic(owl_fmtext *fm, owl_message *m)
 {
+#ifdef HAVE_LIBZEPHYR
   char *body, *indent, *ptr, *zsigbuff, frombuff[LINE];
   ZNotice_t *n;
+#endif
 
   if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
+#ifdef HAVE_LIBZEPHYR
     n=owl_message_get_notice(m);
-
+  
     /* get the body */
     body=owl_strdup(owl_message_get_body(m));
@@ -31 +34 @@
     strcpy(frombuff, owl_message_get_sender(m));
     ptr=strchr(frombuff, '@');
-    if (ptr && !strncmp(ptr+1, ZGetRealm(), strlen(ZGetRealm()))) {
+    if (ptr && !strncmp(ptr+1, owl_zephyr_get_realm(), strlen(owl_zephyr_get_realm()))) {
       *ptr='\0';
     }
@@ -84 +87 @@
       }
       owl_fmtext_append_normal(fm, frombuff);
-      if (strcasecmp(owl_message_get_realm(m), ZGetRealm())) {
+      if (strcasecmp(owl_message_get_realm(m), owl_zephyr_get_realm()) {
         owl_fmtext_append_normal(fm, " {");
         owl_fmtext_append_normal(fm, owl_message_get_realm(m));
@@ -112 +115 @@
     owl_free(body);
     owl_free(indent);
+#endif
   } else if (owl_message_is_type_zephyr(m) && owl_message_is_direction_out(m)) {
     char *indent, *text, *zsigbuff, *foo;
@@ -200 +204 @@
 void owl_stylefunc_default(owl_fmtext *fm, owl_message *m)
 {
+#ifdef HAVE_LIBZEPHYR
   char *body, *indent, *ptr, *zsigbuff, frombuff[LINE];
   ZNotice_t *n;
+#endif
 
   if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
+#ifdef HAVE_LIBZEPHYR
     n=owl_message_get_notice(m);
-  
+
     /* get the body */
     body=owl_malloc(strlen(owl_message_get_body(m))+30);
@@ -222 +229 @@
     strcpy(frombuff, owl_message_get_sender(m));
     ptr=strchr(frombuff, '@');
-    if (ptr && !strncmp(ptr+1, ZGetRealm(), strlen(ZGetRealm()))) {
+    if (ptr && !strncmp(ptr+1, owl_zephyr_get_realm(), strlen(owl_zephyr_get_realm()))) {
       *ptr='\0';
     }
@@ -254 +261 @@
       }
       owl_fmtext_append_normal(fm, " for ");
-      ptr=short_zuser(n->z_class_inst);
+      ptr=short_zuser(owl_zephyr_get_instance(m));
       owl_fmtext_append_bold(fm, ptr);
       owl_free(ptr);
@@ -276 +283 @@
         owl_fmtext_append_normal(fm, "} ");
       }
-      if (n->z_opcode[0]!='\0') {
+      if (strccmp(owl_zephyr_get_opcode(m), "")) {
         owl_fmtext_append_normal(fm, " [");
         owl_fmtext_append_normal(fm, owl_message_get_opcode(m));
@@ -304 +311 @@
     owl_free(body);
     owl_free(indent);
+#endif
   } else if (owl_message_is_type_zephyr(m) && owl_message_is_direction_out(m)) {
     char *indent, *text, *zsigbuff, *foo;
@@ -395 +403 @@
   char *baseformat="%s %-13.13s %-11.11s %-12.12s ";
   char *sender, *recip;
+#ifdef HAVE_LIBZEPHYR
   ZNotice_t *n;
-
+#endif
 
   sender=short_zuser(owl_message_get_sender(m));
@@ -402 +411 @@
   
   if (owl_message_is_type_zephyr(m)) {
+#ifdef HAVE_LIBZEPHYR
     n=owl_message_get_notice(m);
     
@@ -472 +482 @@
     owl_free(sender);
     owl_free(recip);
-    
+#endif
   } else if (owl_message_is_type_aim(m)) {
     owl_fmtext_append_spaces(fm, OWL_TAB);