[373] in BarnOwl Developers
[D-O-H] r515 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:27 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Wed, 10 Jan 2007 15:05:44 -0500 (EST)
Author: nelhage
Date: 2007-01-10 15:05:44 -0500 (Wed, 10 Jan 2007)
New Revision: 515
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r17910@phanatique: nelhage | 2007-01-10 15:03:10 -0500
Making authorizing/denying subscriptions use yes/no
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17909
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17910
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-10 20:03:48 UTC (rev 514)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-10 20:05:44 UTC (rev 515)
@@ -126,7 +126,7 @@
our %vars;
sub onStart {
- if ( eval { \&BarnOwl::queue_message } ) {
+ if ( *BarnOwl::queue_message{CODE} ) {
register_owl_commands();
push @::onMainLoop, sub { owl_jabber::onMainLoop(@_) };
push @::onGetBuddyList, sub { owl_jabber::onGetBuddyList(@_) };
@@ -920,9 +920,11 @@
adminheader => 'Jabber presence: subscribe',
direction => 'in');
- $props{body} = "The user ($from) wants to subscribe to your ($to) presence.\nReply (r) will authorize, reply-sender (R) will deny.";
- $props{replycmd} = "jroster auth $from -a $to";
- $props{replysendercmd} = "jroster deauth $from -a $to";
+ $props{body} = "Allow user ($from) to subscribe to your ($to) presence?\n" .
+ "(Answer with the `yes' or `no' commands)";
+ $props{yescommand} = "jroster auth $from -a $to";
+ $props{nocommand} = "jroster deauth $from -a $to";
+ $props{question} = "true";
BarnOwl::queue_message(BarnOwl::Message->new(%props));
}
