[2576] in BarnOwl Developers
[PATCH] Don't try to load default subs if zephyr has not been initialized yet.
daemon@ATHENA.MIT.EDU (=?UTF-8?q?Alejandro=20R=2E=20Sede=)
Tue Aug 3 18:04:21 2010
From: =?UTF-8?q?Alejandro=20R=2E=20Sede=C3=B1o?= <asedeno@MIT.EDU>
To: barnowl-dev@mit.edu
Date: Tue, 3 Aug 2010 18:04:17 -0400
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
---
zephyr.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/zephyr.c b/zephyr.c
index 4dead4a..8277c18 100644
--- a/zephyr.c
+++ b/zephyr.c
@@ -354,11 +354,13 @@ int owl_zephyr_loadbarnowldefaultsubs(void)
int owl_zephyr_loaddefaultsubs(void)
{
#ifdef HAVE_LIBZEPHYR
- ZSubscription_t subs[10];
+ if (owl_global_is_havezephyr(&g)) {
+ ZSubscription_t subs[10];
- if (ZSubscribeTo(subs,0,0) != ZERR_NONE) {
- owl_function_error("Error subscribing to default zephyr notifications.");
- return(-1);
+ if (ZSubscribeTo(subs,0,0) != ZERR_NONE) {
+ owl_function_error("Error subscribing to default zephyr notifications.");
+ return(-1);
+ }
}
return(0);
#else
--
1.7.2.1
