Changeset 2febcae for commands.c

Timestamp:

Dec 31, 2007, 10:38:43 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

47519e1b

Parents:

7b1d048 (diff), 3617286 (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:

Merged revisions 785-790 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r789 | chmrr | 2007-12-30 20:53:07 -0500 (Sun, 30 Dec 2007) | 5 lines
  
   r1823@utwig:  chmrr | 2007-12-30 20:52:12 -0500
    * Don't conceal subscription errors with the "ok, we added it to the
      .zephyr.subs file" message, by not doing the latter if the former
      fails.
........
  r790 | chmrr | 2007-12-30 22:54:39 -0500 (Sun, 30 Dec 2007) | 1 line
  
   * Canonicalize class and sender, add base_class
........

File:

• commands.c (modified) (2 diffs)

commands.c

@@ -1768 +1768 @@
   char *recip="";
   int temp=0;
+  int ret=0;
   
   if (argc<3) {
@@ -1797 +1798 @@
   }
 
-  owl_function_subscribe(argv[0], argv[1], recip);
-  if (!temp) {
+  ret = owl_function_subscribe(argv[0], argv[1], recip);
+  if (!temp && !ret) {
     owl_zephyr_addsub(NULL, argv[0], argv[1], recip);
   }