Changeset 8ba37ec

Timestamp:

Dec 29, 2003, 2:50:56 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

5ca5f8e

Parents:

421c286f

Message:

Fixed a bug where sending a null zsig could cause a crash
Better 'away' toggling if only one protocol is away.
Bumped version to 2.1.4

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• zephyr.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
 
-2.1.4-pre-1
+2.1.4
         Normalize and downcase AIM names for logging
+        Fixed a bug where sending a null zsig could cause a crash
+        Better 'away' toggling if only one protocol is away.
 
 2.1.3

commands.c

@@ -1398 +1398 @@
 char *owl_command_away(int argc, char **argv, char *buff)
 {
-  owl_command_zaway(argc, argv, buff);
-  owl_command_aaway(argc, argv, buff);
+  if ((argc==1) ||
+      ((argc==2) && !strcmp(argv[1], "on"))) {
+    owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
+    owl_global_set_zaway_msg(&g, owl_global_get_zaway_msg_default(&g));
+    owl_function_aaway_on();
+    owl_function_zaway_on();
+    owl_function_makemsg("Away messages set.", owl_global_get_aaway_msg_default(&g));
+    return NULL;
+  }
+
+  if (argc==2 && !strcmp(argv[1], "off")) {
+    owl_function_aaway_off();
+    owl_function_zaway_off();
+    return NULL;
+  }
+
+  if (argc==2 && !strcmp(argv[1], "toggle")) {
+    /* if either one is on, turn it off, otherwise toggle both (turn
+     *  them both on)
+     */
+    if (!owl_global_is_zaway(&g) && !owl_global_is_aaway(&g)) {
+      owl_function_aaway_toggle();
+      owl_function_zaway_toggle();
+      owl_function_makemsg("Away messages set.");
+    } else {
+      if (owl_global_is_zaway(&g)) owl_function_zaway_toggle();
+      if (owl_global_is_aaway(&g)) owl_function_aaway_toggle();
+      owl_function_makemsg("Away messages off.");
+    }
+    return NULL;
+  }
+
+  buff = skiptokens(buff, 1);
+  owl_global_set_aaway_msg(&g, buff);
+  owl_global_set_zaway_msg(&g, buff);
+  owl_function_aaway_on();
+  owl_function_zaway_on();
+  owl_function_makemsg("Away messages set.");
   return NULL;
 }

owl.h

@@ -20 +20 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.1.4-pre-1
-#define OWL_VERSION_STRING "2.1.4-pre-1"
+#define OWL_VERSION         2.1.4
+#define OWL_VERSION_STRING "2.1.4"
 
 /* Feature that is being tested to redirect stderr through a pipe. 

zephyr.c

@@ -381 +381 @@
 
   ZResetAuthentication();
+
+  if (!zsig) zsig="";
   
   notice.z_kind=ACKED;