Changeset 098376e for owl.c

Timestamp:

Jan 24, 2009, 8:53:45 PM (15 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:

• owl.c (modified) (3 diffs)

owl.c

@@ -323 +323 @@
   sprintf(buff,      "Welcome to barnowl version %s.  Press 'h' for on-line help.            \n", OWL_VERSION_STRING);
   strcat(startupmsg, buff);
+  strcat(startupmsg, "To see a quick introduction, type ':show quickstart'.                  \n");
   strcat(startupmsg, "                                                                       \n");
   strcat(startupmsg, "BarnOwl is free software. Type ':show license' for more                \n");
-  strcat(startupmsg, "information.                                                           \n");
-  strcat(startupmsg, "                                                                 ^ ^   \n");
+  strcat(startupmsg, "information.                                                     ^ ^   \n");
   strcat(startupmsg, "                                                                 OvO   \n");
   strcat(startupmsg, "Please report any bugs or suggestions to bug-barnowl@mit.edu    (   )  \n");
@@ -511 +511 @@
       int signum;
       if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
-        owl_function_error("Got unexpected signal: %d %s  (code: %d band: %d  errno: %d)", 
+        owl_function_error("Got unexpected signal: %d %s  (code: %d band: %ld  errno: %d)",
                            signum, signum==SIGPIPE?"SIGPIPE":"SIG????",
                            si.si_code, si.si_band, si.si_errno);
@@ -612 +612 @@
 
   return 1;
-}
-
-void owl_process_aim()
-{
-  if (owl_global_is_doaimevents(&g)) {
-    owl_aim_process_events();
-    
-    if (owl_global_is_aimloggedin(&g)) {
-      if (owl_timer_is_expired(owl_global_get_aim_buddyinfo_timer(&g))) {
-        /* owl_buddylist_request_idletimes(owl_global_get_buddylist(&g)); */
-        owl_timer_reset(owl_global_get_aim_buddyinfo_timer(&g));
-      }
-    }
-  }
 }