Changes in / [dcc3f80:69c3878]

Files:

• perl/lib/BarnOwl.pm (modified) (1 diff)
• perl/lib/BarnOwl/Zephyr.pm (deleted)
• perlglue.xs (modified) (1 diff)
• zephyr.c (modified) (6 diffs)

perl/lib/BarnOwl.pm

@@ -32 +32 @@
 use BarnOwl::Message;
 use BarnOwl::Style;
-use BarnOwl::Zephyr;
 use BarnOwl::Timer;
 use BarnOwl::Editwin;

perlglue.xs

@@ -442 +442 @@
 
 
-MODULE = BarnOwl                PACKAGE = BarnOwl::Zephyr
-
-int
-have_zephyr()
-        CODE:
-                RETVAL = owl_global_is_havezephyr(&g);
-        OUTPUT:
-                RETVAL
 
 MODULE = BarnOwl                PACKAGE = BarnOwl::Internal

zephyr.c

@@ -82 +82 @@
 void owl_zephyr_finish_initialization(owl_dispatch *d) {
   Code_t code;
-  char *perl;
 
   owl_select_remove_dispatch(d->fd);
@@ -126 +125 @@
     owl_function_zephyr_buddy_check(0);
   }
-
- perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
- owl_free(perl);
 }
 
@@ -172 +168 @@
   }
 #endif
-  return 0;
+  return(0);
 }
 
@@ -180 +176 @@
   if(owl_global_is_havezephyr(&g))
     return(ZPending());
-#endif
-  return 0;
+  else
+    return 0;
+#else
+  return(0);
+#endif
 }
 
@@ -187 +186 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  if (owl_global_is_havezephyr(&g))
-    return(ZGetRealm());
-#endif
-  return "";
+  return(ZGetRealm());
+#else
+  return("");
+#endif
 }
 
@@ -196 +195 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  if (owl_global_is_havezephyr(&g))
-    return(ZGetSender());
-#endif
-  return "";
+  return(ZGetSender());
+#else
+  return("");
+#endif
 }