Changeset 625802a for zephyr.c

Timestamp:

Jan 28, 2008, 1:41:55 PM (16 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:

ee310eb

Parents:

6fe806a (diff), 10e3963 (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 882-908 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r889 | nelhage | 2008-01-16 22:03:00 -0500 (Wed, 16 Jan 2008) | 4 lines
  
  
  Rewrite ::Connection to not subclass Net::IRC::Connection to avoid
  stupid namespace conflicts
........
  r890 | nelhage | 2008-01-16 22:07:42 -0500 (Wed, 16 Jan 2008) | 2 lines
  
  svn:ignore for great justice
........
  r894 | asedeno | 2008-01-17 02:13:44 -0500 (Thu, 17 Jan 2008) | 2 lines
  
  dropping one unnecessary time(NULL) call.
........
  r898 | geofft | 2008-01-18 08:58:53 -0500 (Fri, 18 Jan 2008) | 4 lines
  
  * minor changes to IRC
  * run ./svkversion only once rather than at every cc
  * fix one-line style to format logouts, not just logins
........
  r900 | nelhage | 2008-01-23 23:20:12 -0500 (Wed, 23 Jan 2008) | 3 lines
  
  Fix the error messages sending to users who don't exist or aren't
  signed on.
........

File:

• zephyr.c (modified) (1 diff)

zephyr.c

@@ -613 +613 @@
       tmp = short_zuser(retnotice->z_recipient);
       owl_function_error("%s: Not logged in or subscribing.", tmp);
-      snprintf(buff, BUFFLEN, "Could not send message to %s: not logged in or subscribing to", tmp);
       if(strcmp(retnotice->z_class, "message")) {
         snprintf(buff, BUFFLEN,
-                 "%s class %s, instance %s.\n", buff,
+                 "Could not send message to %s: "
+                 "not logged in or subscribing to class %s, instance %s.\n", 
+                 tmp,
                  retnotice->z_class,
                  retnotice->z_class_inst);
       } else {
         snprintf(buff, BUFFLEN,
-                 "%s messages.\n", buff);
+                 "Could not send message to %s: "
+                 "not logged in or subscribing to messages.\n",
+                 tmp);
       }
       owl_function_adminmsg("", buff);