Changeset 09489b89 for functions.c

Timestamp:

Jul 2, 2003, 6:15:24 PM (22 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:

• functions.c (modified) (9 diffs)

functions.c

@@ -748 +748 @@
 
   /* final clean up */
-  unsuball();
-  ZClosePort();
+  owl_zephyr_shutdown();
   endwin();
   owl_function_debugmsg("Quitting Owl");
@@ -1256 +1255 @@
   owl_message *m;
   owl_fmtext fm, attrfm;
+  char buff[10000];
+  owl_view *v;
+#ifdef HAVE_LIBZEPHYR
   ZNotice_t *n;
-  char buff[10000], tmpbuff[1024];
-  char *ptr;
-  int i, j, fields, len;
-  owl_view *v;
+#endif
 
   owl_fmtext_init_null(&fm);
@@ -1321 +1320 @@
     owl_fmtext_append_normal(&fm, owl_message_get_timestr(m));
     owl_fmtext_append_normal(&fm, "\n");
-
+#ifdef HAVE_LIBZEPHYR
     if (owl_message_is_direction_in(m)) {
+      char *ptr, tmpbuff[1024];
+      int i, j, fields, len;
+
       n=owl_message_get_notice(m);
 
@@ -1394 +1396 @@
       owl_fmtext_append_normal(&fm, n->z_default_format);
     }
+#endif    
   }
 
@@ -1541 +1544 @@
 void owl_function_getsubs()
 {
-  int ret, num, i, one;
-  ZSubscription_t sub;
-  char *buff, *tmpbuff;
-
-  one = 1;
-
-  ret=ZRetrieveSubscriptions(0, &num);
-  if (ret == ZERR_TOOMANYSUBS) {
-    owl_function_makemsg("Zephyr: too many subscriptions");
-    return;
-  }
-
-  buff=owl_malloc(num*500);
-  tmpbuff=owl_malloc(num*500);
-  strcpy(buff, "");
-  for (i=0; i<num; i++) {
-    if ((ret = ZGetSubscriptions(&sub, &one)) != ZERR_NONE) {
-      owl_function_makemsg("Error while getting subscriptions");
-      owl_free(buff);
-      owl_free(tmpbuff);
-      ZFlushSubscriptions();
-      return;
-    } else {
-      sprintf(tmpbuff, "<%s,%s,%s>\n%s", sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient, buff);
-      strcpy(buff, tmpbuff);
-    }
-  }
-
-  owl_function_popless_text(buff);
+  char *buff;
+
+  buff=owl_zephyr_getsubs();
+
+  if (buff) {
+    owl_function_popless_text(buff);
+  } else {
+    owl_function_popless_text("Error getting subscriptions");
+  }
+           
   owl_free(buff);
-  owl_free(tmpbuff);
-  ZFlushSubscriptions();
 }
 
@@ -2863 +2845 @@
 void owl_function_buddylist(int aim, int zephyr, char *file)
 {
-  char *ourfile, *tmp, buff[LINE], *line;
-  FILE *f;
-  int numlocs, ret, i, j;
-  ZLocations_t location[200];
+  int i, j;
   owl_fmtext fm;
   owl_buddylist *b;
+#ifdef HAVE_LIBZEPHYR
+  char *ourfile, *tmp, buff[LINE], *line;
+  ZLocations_t location[200];
+  FILE *f;
+  int numlocs, ret;
+#endif
 
   owl_fmtext_init_null(&fm);
@@ -2884 +2869 @@
   }
 
+#ifdef HAVE_LIBZEPHYR
   if (zephyr) {
     if (file==NULL) {
@@ -2904 +2890 @@
       return;
     }
-    
+
     owl_fmtext_append_bold(&fm, "Zephyr users logged in:\n");
     
@@ -2958 +2944 @@
     owl_free(ourfile);
   }
+#endif
   
   owl_function_popless_fmtext(&fm);