Changeset 6d7e6c6


Ignore:
Timestamp:
Mar 29, 2009, 7:41:30 PM (12 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
owl
Children:
db654df
Parents:
6fdef66
Message:
process aim events with just about any zephyr call
File:
1 edited

Legend:

Unmodified
Added
Removed
  • zephyr.c

    r64b6449 r6d7e6c6  
    2626    return(1);
    2727  }
     28  owl_zephyr_process_events(NULL);
    2829#endif
    2930  return(0);
     
    3536#ifdef HAVE_LIBZEPHYR
    3637  unsuball();
     38  owl_zephyr_process_events(NULL);
    3739  ZClosePort();
    3840#endif
     
    8385    owl_free(subs[i].zsub_recipient);
    8486  }
     87  owl_zephyr_process_events(NULL);
    8588  return ret;
    8689}
     
    173176    return(-1);
    174177  }
     178  owl_zephyr_process_events(NULL);
    175179  return(0);
    176180#else
     
    237241  }
    238242
     243  owl_zephyr_process_events(NULL);
     244
    239245  return(ret);
    240246#else
     
    270276    return(-2);
    271277  }
     278  owl_zephyr_process_events(NULL);
    272279  return(0);
    273280#else
     
    291298    return(-2);
    292299  }
     300  owl_zephyr_process_events(NULL);
    293301  return(0);
    294302#else
     
    460468  owl_free(notice.z_message);
    461469  ZFreeNotice(&notice);
     470  owl_zephyr_process_events(NULL);
    462471  if (ret!=ZERR_NONE) {
    463472    owl_function_error("Error sending zephyr");
     
    473482Code_t send_zephyr_helper(ZNotice_t *notice, char *buf, int len, int wait)
    474483{
    475   return(ZSendPacket(buf, len, 0));
     484  int ret;
     485  ret=ZSendPacket(buf, len, 0);
     486  owl_zephyr_process_events(NULL);
     487  return(ret);
    476488}
    477489#endif
     
    481493#ifdef HAVE_LIBZEPHYR
    482494  send_zephyr("PING", "", "MESSAGE", "PERSONAL", to, "");
     495  owl_zephyr_process_events(NULL);
    483496#endif
    484497}
     
    622635  ZResetAuthentication();
    623636  ret=ZLocateUser(user,&numlocs,auth?ZAUTH:ZNOAUTH);
     637  owl_zephyr_process_events(NULL);
    624638  if (ret != ZERR_NONE) {
    625639    return(owl_sprintf("Error locating user %s\n", user));
     
    647661    owl_free(myuser);
    648662  }
     663  owl_zephyr_process_events(NULL);
    649664  return(out);
    650665#else
     
    750765   
    751766  ret=ZSetLocation(eset);
     767  owl_zephyr_process_events(NULL);
    752768  if (ret != ZERR_NONE) {
    753769    /* owl_function_makemsg("Error setting location: %s", error_message(ret)); */
     
    763779  ZResetAuthentication();
    764780  ret=ZUnsetLocation();
     781  owl_zephyr_process_events(NULL);
    765782  if (ret != ZERR_NONE) {
    766783    /* owl_function_makemsg("Error unsetting location: %s", error_message(ret)); */
     
    849866      int tmpbufflen;
    850867      char *tmpbuff;
     868      owl_zephyr_process_events(NULL);
    851869      tmpbuff = owl_sprintf("<%s,%s,%s>\n%s", sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient, out);
    852870      tmpbufflen = strlen(tmpbuff) + 1;
     
    870888
    871889  ZFlushSubscriptions();
     890  owl_zephyr_process_events(NULL);
    872891  return(out);
    873892#else
     
    889908#ifdef HAVE_LIBZEPHYR
    890909  ZInitLocationInfo(host, val);
     910  owl_zephyr_process_events(NULL);
    891911#endif
    892912}
Note: See TracChangeset for help on using the changeset viewer.