Changes in / [1cf32e7d:a387d12e]

Files:

• logging.c (modified) (2 diffs)
• perlglue.xs (modified) (3 diffs)
• perlwrap.pm (modified) (4 diffs)

logging.c

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

perlglue.xs

@@ -121 +121 @@
         {
                 if(!SvROK(msg) || SvTYPE(SvRV(msg)) != SVt_PVHV) {
-                        croak("Usage: BarnOwl::queue_message($message)");
+                        croak("Usage: owl::queue_message($message)");
                 }
 
@@ -136 +136 @@
         {
                 if(!SvROK(msg) || SvTYPE(SvRV(msg)) != SVt_PVHV) {
-                        croak("Usage: BarnOwl::add_message($message)");
+                        croak("Usage: owl::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);
                 }
         }

perlwrap.pm

@@ -241 +241 @@
 use base qw( BarnOwl::Message );
 
-# all loopback messages are private
-sub is_private {
+# all loopback messages are personal
+sub is_personal {
   return 1;
 }
@@ -253 +253 @@
 use base qw( BarnOwl::Message );
 
-# all non-loginout AIM messages are private for now...
-sub is_private {
+# all non-loginout AIM messages are personal for now...
+sub is_personal {
     return !(shift->is_loginout);
 }
@@ -505 +505 @@
     } else {
         $header = $m->context;
-        if(defined $m->subcontext) {
+        if($m->subcontext) {
             $header .= ' / ' . $m->subcontext;
         }
@@ -517 +517 @@
     $header .= "(" . $sender . ")";
     my $message = $header . "\n". indentBody($m);
-    if($m->is_personal && $m->direction eq "in") {
+    if($m->is_private && $m->direction eq "in") {
         $message = BarnOwl::Style::boldify($message);
     }