Changeset 1d3e925

Timestamp:

Jun 27, 2003, 5:22:39 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:

5bb6c21

Parents:

f562355

Message:

make webzephyr login/logout messages count as login/logout messages

Files:

• functions.c (modified) (1 diff)
• message.c (modified) (1 diff)
• owl.h (modified) (1 diff)

functions.c

@@ -1798 +1798 @@
 
       /* Special case a personal reply to a webzephyr user on a class */
-      if ((type==1) && !strcasecmp(owl_message_get_opcode(m), "webzephyr")) {
-        class="webzephyr";
+      if ((type==1) && !strcasecmp(owl_message_get_opcode(m), OWL_WEBZEPHYR_OPCODE)) {
+        class=OWL_WEBZEPHYR_CLASS;
         inst=owl_message_get_sender(m);
         to=OWL_WEBZEPHYR_PRINCIPAL;
-      } else if (!strcasecmp(owl_message_get_class(m), "webzephyr") &&
-                 owl_message_is_loginout(m)) {
+      } else if (!strcasecmp(owl_message_get_class(m), OWL_WEBZEPHYR_CLASS) && owl_message_is_loginout(m)) {
         /* Special case LOGIN/LOGOUT notifications on class "webzephyr" */
-        class="webzephyr";
+        class=OWL_WEBZEPHYR_CLASS;
         inst=owl_message_get_instance(m);
         to=OWL_WEBZEPHYR_PRINCIPAL;

message.c

@@ -658 +658 @@
 
   /* Set the "isloginout" attribute if it's a login message */
-  if (!strcasecmp(n->z_class, "login")) {
+  if (!strcasecmp(n->z_class, "login") || !strcasecmp(n->z_class, OWL_WEBZEPHYR_CLASS)) {
     if (!strcasecmp(n->z_opcode, "user_login")) {
       owl_message_set_islogin(m);

owl.h

@@ -124 +124 @@
 
 #define OWL_WEBZEPHYR_PRINCIPAL "daemon.webzephyr"
+#define OWL_WEBZEPHYR_CLASS     "webzephyr"
+#define OWL_WEBZEPHYR_OPCODE    "webzephyr"
 
 #if defined(HAVE_DES_STRING_TO_KEY) && defined(HAVE_DES_KEY_SCHED) && defined(HAVE_DES_ECB_ENCRYPT)