Changes in / [69c3878:dcc3f80]

Files:

• perl/lib/BarnOwl.pm (modified) (1 diff)
• perl/lib/BarnOwl/Zephyr.pm (added)
• 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);
@@ -125 +126 @@
     owl_function_zephyr_buddy_check(0);
   }
+
+ perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
+ owl_free(perl);
 }
 
@@ -168 +172 @@
   }
 #endif
-  return(0);
+  return 0;
 }
 
@@ -176 +180 @@
   if(owl_global_is_havezephyr(&g))
     return(ZPending());
-  else
-    return 0;
-#else
-  return(0);
-#endif
+#endif
+  return 0;
 }
 
@@ -186 +187 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  return(ZGetRealm());
-#else
-  return("");
-#endif
+  if (owl_global_is_havezephyr(&g))
+    return(ZGetRealm());
+#endif
+  return "";
 }
 
@@ -195 +196 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  return(ZGetSender());
-#else
-  return("");
-#endif
+  if (owl_global_is_havezephyr(&g))
+    return(ZGetSender());
+#endif
+  return "";
 }