Changeset 03955f3

Timestamp:

Jul 2, 2003, 7:33:14 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:

e6449bc

Parents:

373b7e7

Message:

Fixed a few glitches introduced in the new build

Files:

• config.h.in (modified) (1 diff)
• configure (modified) (1 diff)
• stylefunc.c (modified) (3 diffs)
• zephyr.c (modified) (1 diff)

config.h.in

@@ -43 +43 @@
 #undef HAVE_LIBZEPHYR
 
-#undef HAVE_ZEPHYR_ZEPHYR_H
-
 /* Define if libzephyr contains ZInitLocationInfo */
 #undef HAVE_LIBZEPHYR_ZINITLOCATIONINFO

configure

@@ -1737 +1737 @@
 fi
 
-for ac_hdr in strings.h sys/ioctl.h unistd.h zephyr/zephyr.h
+for ac_hdr in strings.h sys/ioctl.h unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`

stylefunc.c

@@ -87 +87 @@
       }
       owl_fmtext_append_normal(fm, frombuff);
-      if (strcasecmp(owl_message_get_realm(m), owl_zephyr_get_realm()) {
+      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));
@@ -261 +261 @@
       }
       owl_fmtext_append_normal(fm, " for ");
-      ptr=short_zuser(owl_zephyr_get_instance(m));
+      ptr=short_zuser(owl_message_get_instance(m));
       owl_fmtext_append_bold(fm, ptr);
       owl_free(ptr);
@@ -283 +283 @@
         owl_fmtext_append_normal(fm, "} ");
       }
-      if (strccmp(owl_zephyr_get_opcode(m), "")) {
+      if (strcmp(owl_message_get_opcode(m), "")) {
         owl_fmtext_append_normal(fm, " [");
         owl_fmtext_append_normal(fm, owl_message_get_opcode(m));

zephyr.c

@@ -761 +761 @@
       return(out);
     } else {
-      sprintf(tmpbuff, "<%s,%s,%s>\n%s", sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient, buff);
+      sprintf(tmpbuff, "<%s,%s,%s>\n%s", sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient, out);
       strcpy(out, tmpbuff);
     }