Changeset 3066d23

Timestamp:

Mar 22, 2007, 11:30:13 AM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

1cf32e7d

Parents:

fbd07e9

Message:

Fix outgoing jabber logging.

Added two new perlglue functions:

* log_message - takes a message hash, turns it into an owl message,
and passes it to the logger.

* add_and_log_message - combination off add_message and
log_message. Takes a message hash, turns it into an owl message, logs
it, and adds the same message to the message list if needed. This
exists for convenience, so we don't have to convert the message hash
twice.

Also, took out an extraneous check from logging.c.

Files:

• logging.c (modified) (2 diffs)
• perl/modules/jabber.pl (modified) (1 diff)
• perlglue.xs (modified) (3 diffs)

logging.c

@@ -363 +363 @@
   if (owl_message_is_type_zephyr(m)) {
     if (personal) {
-      if (owl_message_is_type_zephyr(m)) {
-        from=frombuff=short_zuser(owl_message_get_sender(m));
-      }
+      from=frombuff=short_zuser(owl_message_get_sender(m));
     } else {
       from=frombuff=owl_strdup(owl_message_get_class(m));
@@ -384 +382 @@
       from=frombuff=owl_sprintf("jabber:%s",owl_message_get_recipient(m));
     }
-      
   } else {
     from=frombuff=owl_strdup("unknown");

perl/modules/jabber.pl

@@ -1026 +1026 @@
     my $m = j2o( $j, { direction => 'out' } );
     if ( $vars{jwrite}{type} ne 'groupchat') {
-        BarnOwl::add_message($m);
+        BarnOwl::add_and_log_message($m);
     }
 

perlglue.xs

@@ -121 +121 @@
         {
                 if(!SvROK(msg) || SvTYPE(SvRV(msg)) != SVt_PVHV) {
-                        croak("Usage: owl::queue_message($message)");
+                        croak("Usage: BarnOwl::queue_message($message)");
                 }
 
@@ -136 +136 @@
         {
                 if(!SvROK(msg) || SvTYPE(SvRV(msg)) != SVt_PVHV) {
-                        croak("Usage: owl::add_message($message)");
+                        croak("Usage: BarnOwl::add_message($message)");
                 }
 
@@ -142 +142 @@
                         m = owl_perlconfig_hashref2message(msg);
                         owl_function_add_message(m);
+                }
+        }
+
+void log_message(msg) 
+        SV *msg
+        PREINIT:
+                owl_message *m;
+        CODE:
+        {
+                if(!SvROK(msg) || SvTYPE(SvRV(msg)) != SVt_PVHV) {
+                        croak("Usage: BarnOwl::log_message($message)");
+                }
+
+                m = owl_perlconfig_hashref2message(msg);
+                owl_log_message(m);
+                owl_message_free(m);
+        }
+
+void add_and_log_message(msg) 
+        SV *msg
+        PREINIT:
+                owl_message *m;
+        CODE:
+        {
+                if(!SvROK(msg) || SvTYPE(SvRV(msg)) != SVt_PVHV) {
+                        croak("Usage: BarnOwl::add_and_log_message($message)");
+                }
+
+                m = owl_perlconfig_hashref2message(msg);
+                owl_log_message(m);
+                if (owl_global_is_displayoutgoing(&g)) {
+                        owl_function_add_message(m);
+                } else {
+                        owl_message_free(m);
                 }
         }