Changeset 098376e for owl.c


Ignore:
Timestamp:
Jan 24, 2009, 8:53:45 PM (12 years ago)
Author:
Evan Broder <broder@mit.edu>
Children:
92f8fc2
Parents:
209ea94 (diff), b940b91 (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 commit 'barnowl-1.0.4.1' into debian
File:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.c

    r5b37c063 r098376e  
    323323  sprintf(buff,      "Welcome to barnowl version %s.  Press 'h' for on-line help.            \n", OWL_VERSION_STRING);
    324324  strcat(startupmsg, buff);
     325  strcat(startupmsg, "To see a quick introduction, type ':show quickstart'.                  \n");
    325326  strcat(startupmsg, "                                                                       \n");
    326327  strcat(startupmsg, "BarnOwl is free software. Type ':show license' for more                \n");
    327   strcat(startupmsg, "information.                                                           \n");
    328   strcat(startupmsg, "                                                                 ^ ^   \n");
     328  strcat(startupmsg, "information.                                                     ^ ^   \n");
    329329  strcat(startupmsg, "                                                                 OvO   \n");
    330330  strcat(startupmsg, "Please report any bugs or suggestions to bug-barnowl@mit.edu    (   )  \n");
     
    511511      int signum;
    512512      if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
    513         owl_function_error("Got unexpected signal: %d %s  (code: %d band: %d  errno: %d)",
     513        owl_function_error("Got unexpected signal: %d %s  (code: %d band: %ld  errno: %d)",
    514514                           signum, signum==SIGPIPE?"SIGPIPE":"SIG????",
    515515                           si.si_code, si.si_band, si.si_errno);
     
    612612
    613613  return 1;
    614 }
    615 
    616 void owl_process_aim()
    617 {
    618   if (owl_global_is_doaimevents(&g)) {
    619     owl_aim_process_events();
    620    
    621     if (owl_global_is_aimloggedin(&g)) {
    622       if (owl_timer_is_expired(owl_global_get_aim_buddyinfo_timer(&g))) {
    623         /* owl_buddylist_request_idletimes(owl_global_get_buddylist(&g)); */
    624         owl_timer_reset(owl_global_get_aim_buddyinfo_timer(&g));
    625       }
    626     }
    627   }
    628614}
    629615
Note: See TracChangeset for help on using the changeset viewer.