Changeset 7c8060d0


Ignore:
Timestamp:
Feb 21, 2003, 1:14:00 PM (18 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
316962a
Parents:
9501423
Message:
Zaway now obeys the smart strip variable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r9501423 r7c8060d0  
    2828          command
    2929        Made M-n work on classes and instances with spaces in them
     30        Zaway now obeys the smart strip variable
    3031
    3132       
  • functions.c

    red2412d r7c8060d0  
    16491649          if (owl_global_is_smartstrip(&g)) {
    16501650            tmp2=tmp;
    1651             tmp=smartstripped_user(tmp2);
     1651            tmp=owl_util_smartstripped_user(tmp2);
    16521652            owl_free(tmp2);
    16531653          }
  • util.c

    red2412d r7c8060d0  
    425425
    426426
    427 char *smartstripped_user(char *in) {
     427char *owl_util_smartstripped_user(char *in) {
    428428  /* strip out the instance from a zsender's principal.  Preserves the
    429429   * realm if present.  daemon.webzephyr is a special case.  The
  • zephyr.c

    r7933748 r7c8060d0  
    331331 
    332332void owl_zephyr_zaway(owl_message *m) {
    333   char *tmpbuff, *myuser;
     333  char *tmpbuff, *myuser, *to;
    334334 
    335335  /* bail if it doesn't look like a message we should reply to.  Some
     
    343343  if (!strcasecmp(owl_message_get_sender(m), ZGetSender())) return;
    344344
     345  if (owl_global_is_smartstrip(&g)) {
     346    to=owl_util_smartstripped_user(owl_message_get_sender(m));
     347  } else {
     348    to=owl_strdup(owl_message_get_sender(m));
     349  }
     350
    345351  send_zephyr("",
    346352              "Automated reply:",
    347353              owl_message_get_class(m),
    348354              owl_message_get_instance(m),
    349               owl_message_get_sender(m),
     355              to,
    350356              owl_global_get_zaway_msg(&g));
    351357
    352   myuser=short_zuser(owl_message_get_sender(m));
     358  myuser=short_zuser(to);
    353359  if (!strcasecmp(owl_message_get_instance(m), "personal")) {
    354360    tmpbuff = owl_sprintf("zwrite %s", myuser);
     
    357363  }
    358364  owl_free(myuser);
     365  owl_free(to);
    359366
    360367  /* display the message as an admin message in the receive window */
Note: See TracChangeset for help on using the changeset viewer.