Changes in zephyr.c [ecffae6:c855755]

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -38 +38 @@
     return g_strdup(input);
   else
-    return g_strdup_printf("%s/%s", owl_global_get_homedir(&g), name);
+    return g_build_filename(owl_global_get_homedir(&g), name, NULL);
 }
 
@@ -1231 +1231 @@
     return -1;
   ret = ZSetLocation(zstr(exposure));
-  if (ret != ZERR_NONE) {
+  if (ret != ZERR_NONE
+#ifdef ZCONST
+      /* Before zephyr 3.0, ZSetLocation had a bug where, if you were subscribed
+       * to your own logins, it could wait for the wrong notice and return
+       * ZERR_INTERNAL when found neither SERVACK nor SERVNAK. Suppress it when
+       * building against the old ABI. */
+      && ret != ZERR_INTERNAL
+#endif
+     ) {
     owl_function_error("Unable to set exposure level: %s.", error_message(ret));
     return -1;