diff -ru3 owl-2.1.11/commands.c owl-2.1.11.asedeno/commands.c --- owl-2.1.11/commands.c 2005-01-30 12:38:56.000000000 -0500 +++ owl-2.1.11.asedeno/commands.c 2006-03-12 23:58:18.000000000 -0500 @@ -699,6 +699,10 @@ "returns the name of the filter for the current view", "", ""), + OWLCMD_ARGS("getstyle", owl_command_getstyle, OWL_CTX_INTERACTIVE, + "returns the name of the filter for the current view", + "", ""), + OWLCMD_ARGS("getvar", owl_command_getvar, OWL_CTX_INTERACTIVE, "returns the value of a variable", "getvar ", ""), @@ -2398,6 +2402,18 @@ return(NULL); } +char *owl_command_getstyle(int argc, char **argv, char *buff) +{ + char *stylename; + if (argc != 1) { + owl_function_makemsg("Wrong number of arguments for %s", argv[0]); + return NULL; + } + stylename = owl_view_get_style_name(owl_global_get_current_view(&g)); + if (stylename) stylename = owl_strdup(stylename); + return stylename; +} + /*********************************************************************/ /************************** EDIT SPECIFIC ****************************/ /*********************************************************************/ diff -ru3 owl-2.1.11/libfaim/rxhandlers.c owl-2.1.11.asedeno/libfaim/rxhandlers.c --- owl-2.1.11/libfaim/rxhandlers.c 2005-01-30 12:38:56.000000000 -0500 +++ owl-2.1.11.asedeno/libfaim/rxhandlers.c 2006-03-12 20:09:20.000000000 -0500 @@ -66,7 +66,7 @@ } mod->next = (aim_module_t *)sess->modlistv; - (aim_module_t *)sess->modlistv = mod; + /*(aim_module_t *)*/sess->modlistv = mod; faimdprintf(sess, 1, "registered module %s (family 0x%04x, version = 0x%04x, tool 0x%04x, tool version 0x%04x)\n", mod->name, mod->family, mod->version, mod->toolid, mod->toolversion); diff -ru3 owl-2.1.11/owl.h owl-2.1.11.asedeno/owl.h --- owl-2.1.11/perlconfig.c 2005-01-30 12:38:56.000000000 -0500 +++ owl-2.1.11.asedeno/perlconfig.c 2006-03-12 21:31:03.000000000 -0500 @@ -73,6 +73,7 @@ hv_store(h, "time", strlen("time"), newSVpv(owl_message_get_timestr(m),0),0); hv_store(h, "id", strlen("id"), newSViv(owl_message_get_id(m)),0); hv_store(h, "deleted", strlen("deleted"), newSViv(owl_message_is_delete(m)),0); + hv_store(h, "private", strlen("private"), newSViv(owl_message_is_private(m)),0); if (owl_message_is_type_zephyr(m)) blessas = "owl::Message::Zephyr"; else if (owl_message_is_type_aim(m)) blessas = "owl::Message::AIM"; diff -ru3 owl-2.1.11/perlwrap.pm owl-2.1.11.asedeno/perlwrap.pm --- owl-2.1.11/perlwrap.pm 2005-01-30 12:38:56.000000000 -0500 +++ owl-2.1.11.asedeno/perlwrap.pm 2006-03-13 13:59:16.000000000 -0500 @@ -44,6 +44,7 @@ sub sender { return shift->{"sender"}; } sub recipient { return shift->{"recipient"}; } sub login { return shift->{"login"}; } +sub is_private { return shift->{"private"}; } sub is_login { return shift->login eq "login"; } sub is_logout { return shift->login eq "logout"; } @@ -62,7 +63,6 @@ sub is_ping { return 0; } sub is_mail { return 0; } sub is_personal { return undef; } -sub is_private { return undef; } sub class { return undef; } sub instance { return undef; } sub realm { return undef; } @@ -89,6 +89,7 @@ &owl::command("undelete --id ".$m->id); } + # Serializes the message into something similar to the zwgc->vt format sub serialize { my ($this) = @_; @@ -190,11 +191,6 @@ sub is_ping { return (lc(shift->opcode) eq "ping"); } -sub is_private { - my ($m) = @_; - return (lc($m->recipient) eq lc(owl::zephyr_getsender())); -} - sub is_personal { my ($m) = @_; return ((lc($m->class) eq "message")