Changeset f1a71c8

Timestamp:

Aug 28, 2013, 6:36:07 PM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

ca1fb26a (diff), 441fd42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 441fd42c37f0c4bde4b84cd57720625d4787ab73 into ca1fb26a9a22aea6ecd68b0150859ef065c6afc5

Files:

• ChangeLog (modified) (1 diff)
• owl.c (modified) (1 diff)
• perl/modules/Facebook/README (modified) (1 diff)
• zephyr.c (modified) (3 diffs)

ChangeLog

@@ -321 +321 @@
  * Support --program-{prefix,suffix,transform}. -nelhage
  * Send instanced pings and give useful error messages -adehnert
- * Add <message,*,%me%> to default Barnowl subs. -adehnert
+ * Add <message,*,%me%> to default BarnOwl subs. -adehnert
  * Maintain instance when using shift-R on personals -adehnert
  * Improve handling of outgoing instanced personals -adehnert

owl.c

@@ -36 +36 @@
 void usage(FILE *file)
 {
-  fprintf(file, "Barnowl version %s\n", version);
+  fprintf(file, "BarnOwl version %s\n", version);
   fprintf(file, "Usage: barnowl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [-s <confdir>] [-t <ttyname>]\n");
   fprintf(file, "  -n,--no-subs        don't load zephyr subscriptions\n");
   fprintf(file, "  -d,--debug          enable debugging\n");
-  fprintf(file, "  -v,--version        print the Barnowl version number and exit\n");
+  fprintf(file, "  -v,--version        print the BarnOwl version number and exit\n");
   fprintf(file, "  -h,--help           print this help message\n");
   fprintf(file, "  -s,--config-dir     specify an alternate config dir (default ~/.owl)\n");

perl/modules/Facebook/README

@@ -14 +14 @@
 
   This token will persist across BarnOwls until you change your
-  Facebook password or you revoke permissions for Barnowl at:
+  Facebook password or you revoke permissions for BarnOwl at:
     http://www.facebook.com/settings/?tab=applications&app_id=235537266461636
 
-  (3) Start receiving wall updates in Barnowl!
+  (3) Start receiving wall updates in BarnOwl!
   You can post updates with the ":facebook" command.
 

zephyr.c

@@ -152 +152 @@
   ret_sd = owl_zephyr_loaddefaultsubs();
 
-  /* load Barnowl default subscriptions */
+  /* load BarnOwl default subscriptions */
   ret_bd = owl_zephyr_loadbarnowldefaultsubs();
 
@@ -354 +354 @@
 }
 
-/* Load default Barnowl subscriptions
+/* Load default BarnOwl subscriptions
  *
  * Returns 0 on success.
@@ -363 +363 @@
 #ifdef HAVE_LIBZEPHYR
   ZSubscription_t *subs;
-  int subSize = 10; /* Max Barnowl default subs we allow */
+  int subSize = 10; /* Max BarnOwl default subs we allow */
   int count, ret;