Changeset 5789230 for message.c

Timestamp:

Jun 5, 2003, 2:26:51 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:

aac889a

Parents:

ae4cd12

Message:

'isloginout' and 'isprivate' are now message attributes
improved 'info' function lists seperate info for zephyr, aim and
   also prints all message attributes

File:

• message.c (modified) (11 diffs)

message.c

@@ -78 +78 @@
 }
 
+/* We cheat and indent it for now, since we really want this for
+ * the 'info' function.  Later there should just be a generic
+ * function to indent fmtext.
+ */
+void owl_message_attributes_tofmtext(owl_message *m, owl_fmtext *fm) {
+  int i, j;
+  owl_pair *p;
+  char *buff;
+
+  owl_fmtext_init_null(fm);
+
+  j=owl_list_get_size(&(m->attributes));
+  for (i=0; i<j; i++) {
+    p=owl_list_get_element(&(m->attributes), i);
+    buff=owl_sprintf("  %-15.15s: %-35.35s\n", owl_pair_get_key(p), owl_pair_get_value(p));
+    owl_fmtext_append_normal(fm, buff);
+    owl_free(buff);
+  }
+}
 
 owl_fmtext *owl_message_get_fmtext(owl_message *m)
@@ -197 +216 @@
   if (!opcode) return("");
   return(opcode);
+}
+
+
+void owl_message_set_isloginout(owl_message *m)
+{
+  owl_message_set_attribute(m, "isloginout", "");
+}
+
+int owl_message_is_loginout(owl_message *m)
+{
+  char *res;
+
+  res=owl_message_get_attribute_value(m, "isloginout");
+  if (!res) return(0);
+  return(1);
+}
+
+void owl_message_set_isprivate(owl_message *m)
+{
+  owl_message_set_attribute(m, "isprivate", "");
+}
+
+int owl_message_is_private(owl_message *m)
+{
+  char *res;
+
+  res=owl_message_get_attribute_value(m, "isprivate");
+  if (!res) return(0);
+  return(1);
 }
 
@@ -255 +303 @@
 }
 
-
 char *owl_message_get_text(owl_message *m)
 {
@@ -376 +423 @@
 }
 
-/* true if the message is only intended for one recipient (me) */
-int owl_message_is_to_me(owl_message *m)
-{
-  if (owl_message_is_type_zephyr(m)) {
-    if (!strcasecmp(owl_message_get_recipient(m), ZGetSender())) {
-      return(1);
-    } else {
-      return(0);
-    }
-  } else if (owl_message_is_type_aim(m)) {
-    /* right now we don't support chat rooms */
-    return(1);
-  } else if (owl_message_is_type_admin(m)) {
-    return(1);
-  }
-  return(0);
-}
-
-
 int owl_message_is_from_me(owl_message *m)
 {
@@ -418 +446 @@
 {
   if (owl_message_is_type_zephyr(m)) {
-    if (!strcasecmp(owl_message_get_class(m), "mail") && owl_message_is_to_me(m)) {
+    if (!strcasecmp(owl_message_get_class(m), "mail") && owl_message_is_private(m)) {
       return(1);
     } else {
@@ -439 +467 @@
 }
 
-int owl_message_is_login(owl_message *m)
-{
-  if (owl_message_is_type_zephyr(m)) {
-    if (!strcasecmp(owl_message_get_class(m), "login")) {
-      return(1);
-    } else {
-      return(0);
-    }
-  } else if (owl_message_is_type_aim(m)) {
-    /* deal with this once we can use buddy lists */
-    return(0);
-  }
-       
-  return(0);
-}
-
 int owl_message_is_burningears(owl_message *m)
 {
@@ -461 +473 @@
 
   /* if the message is from us or to us, it doesn't count */
-  if (owl_message_is_from_me(m) || owl_message_is_to_me(m)) return(0);
+  if (owl_message_is_from_me(m) || owl_message_is_private(m)) return(0);
 
   if (owl_message_is_type_zephyr(m)) {
@@ -539 +551 @@
   owl_message_set_type_aim(m);
   owl_message_set_direction_in(m);
+
+  /* for now, all AIM messages are private messages since we don't do chat rooms */
+  owl_message_set_isprivate(m);
 
   indent=owl_malloc(strlen(text)+owl_text_num_lines(text)*OWL_MSGTAB+10);
@@ -593 +608 @@
   owl_message_set_direction_in(m);
 
+  owl_message_set_isloginout(m);
+
   owl_fmtext_init_null(&(m->fmtext));
   owl_fmtext_append_normal(&(m->fmtext), OWL_TABSTR);
@@ -666 +683 @@
   } else {
     owl_message_set_realm(m, ZGetRealm());
+  }
+
+  /* Set the "isloginout" attribute if it's a login message */
+  if (!strcasecmp(n->z_class, "login")) {
+    owl_message_set_isloginout(m);
+  }
+
+  /* is the "isprivate" attribute if it's a private zephyr */
+  if (!strcasecmp(n->z_recipient, ZGetSender())) {
+    owl_message_set_isprivate(m);
   }
 
@@ -879 +906 @@
   owl_fmtext_append_normal(&(m->fmtext), OWL_TABSTR);
 
-  if (!strcasecmp(owl_message_get_opcode(m), "ping") && owl_message_is_to_me(m)) {
+  if (!strcasecmp(owl_message_get_opcode(m), "ping") && owl_message_is_private(m)) {
     owl_fmtext_append_bold(&(m->fmtext), "PING");
     owl_fmtext_append_normal(&(m->fmtext), " from ");