Changeset 7451af9 for zephyr.c

Timestamp:

May 26, 2009, 10:32:00 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

3ef779b

Parents:

f0f919d

git-author:

Alexander W Dehnert <adehnert@mit.edu> (05/26/09 14:49:46)

git-committer:

Nelson Elhage <nelhage@mit.edu> (05/26/09 22:32:00)

Message:

Add <message,*,%me%> to default Barnowl subs.

Also adds support for default Barnowl subs and
fixes the return value of owl_zephyr_loadsubs.

File:

• zephyr.c (modified) (3 diffs)

zephyr.c

@@ -125 +125 @@
 
 void owl_zephyr_load_initial_subs() {
-  int ret, ret2;
+  int ret_sd, ret_bd, ret_u;
 
   owl_function_debugmsg("startup: loading initial zephyr subs");
 
   /* load default subscriptions */
-  ret = owl_zephyr_loaddefaultsubs();
+  ret_sd = owl_zephyr_loaddefaultsubs();
+
+  /* load Barnowl default subscriptions */
+  ret_bd = owl_zephyr_loadbarnowldefaultsubs();
 
   /* load subscriptions from subs file */
-  ret2 = owl_zephyr_loadsubs(NULL, 0);
-
-  if (ret || ret2) {
+  ret_u = owl_zephyr_loadsubs(NULL, 0);
+
+  if (ret_sd || ret_bd || ret_u) {
     owl_function_error("Error loading zephyr subscriptions");
-  } else if (ret2!=-1) {
+  } else if (ret_u!=-1) {
     owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
   }
@@ -226 +229 @@
 #endif
 
-/* Load zephyr subscriptions form 'filename'.  If 'filename' is NULL,
+/* Load zephyr subscriptions from 'filename'.  If 'filename' is NULL,
  * the default file $HOME/.zephyr.subs will be used.
  *
@@ -298 +301 @@
   fclose(file);
 
-  owl_zephyr_loadsubs_helper(subs, count);
+  ret = owl_zephyr_loadsubs_helper(subs, count);
+  return(ret);
+#else
+  return(0);
+#endif
+}
+
+/* Load default Barnowl subscriptions
+ *
+ * Returns 0 on success.
+ * Return -2 if there is a failure from zephyr to load the subscriptions.
+ */
+int owl_zephyr_loadbarnowldefaultsubs()
+{
+#ifdef HAVE_LIBZEPHYR
+  ZSubscription_t *subs;
+  int subSize = 10; /* Max Barnowl default subs we allow */
+  int count, ret;
+
+  subs = owl_malloc(sizeof(ZSubscription_t) * subSize);
+  ret = 0;
+  ZResetAuthentication();
+  count=0;
+
+  subs[count].zsub_class=owl_strdup("message");
+  subs[count].zsub_classinst=owl_strdup("*");
+  subs[count].zsub_recipient=owl_strdup("%me%");
+  count++;
+
+  ret = owl_zephyr_loadsubs_helper(subs, count);
   return(ret);
 #else