[941] in BarnOwl Developers
[D-O-H] r928 - in branches/barnowl_unicode: . owl
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:11:22 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 4 Feb 2008 20:14:24 -0500 (EST)
Author: asedeno
Date: 2008-02-04 20:14:23 -0500 (Mon, 04 Feb 2008)
New Revision: 928
Modified:
branches/barnowl_unicode/
branches/barnowl_unicode/owl/fmtext.c
branches/barnowl_unicode/owl/variable.c
branches/barnowl_unicode/owl/zephyr.c
Log:
Merged revisions 924-927 via svnmerge from
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk
........
r926 | geofft | 2008-02-04 18:20:08 -0500 (Mon, 04 Feb 2008) | 2 lines
Add the variable 'zsender' to customize the outgoing Zephyr username.
........
r927 | asedeno | 2008-02-04 20:11:37 -0500 (Mon, 04 Feb 2008) | 1 line
bufflen should be initialized on copy.
........
Property changes on: branches/barnowl_unicode
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-923
+ /trunk:1-927
Modified: branches/barnowl_unicode/owl/fmtext.c
===================================================================
--- branches/barnowl_unicode/owl/fmtext.c 2008-02-05 01:11:37 UTC (rev 927)
+++ branches/barnowl_unicode/owl/fmtext.c 2008-02-05 01:14:23 UTC (rev 928)
@@ -535,6 +535,7 @@
mallocsize=src->textlen+2;
}
dst->textlen=src->textlen;
+ dst->bufflen=mallocsize;
dst->textbuff=owl_malloc(mallocsize);
memcpy(dst->textbuff, src->textbuff, src->textlen+1);
dst->default_attrs = src->default_attrs;
Modified: branches/barnowl_unicode/owl/variable.c
===================================================================
--- branches/barnowl_unicode/owl/variable.c 2008-02-05 01:11:37 UTC (rev 927)
+++ branches/barnowl_unicode/owl/variable.c 2008-02-05 01:14:23 UTC (rev 928)
@@ -208,6 +208,13 @@
"messages. It will not be run again until the first\n"
"instance exits"),
+ OWLVAR_STRING( "zsender" /* %OwlVarStub */, "",
+ "zephyr sender name",
+ "Allows you to customize the outgoing username in\n"
+ "zephyrs. If this is unset, it will use your Kerberos\n"
+ "principal. Note that customizing the sender name will\n"
+ "cause your zephyrs to be sent unauthenticated."),
+
OWLVAR_STRING( "zsig" /* %OwlVarStub */, "",
"zephyr signature",
"If 'zsigproc' is not set, this string will be used\n"
Modified: branches/barnowl_unicode/owl/zephyr.c
===================================================================
--- branches/barnowl_unicode/owl/zephyr.c 2008-02-05 01:11:37 UTC (rev 927)
+++ branches/barnowl_unicode/owl/zephyr.c 2008-02-05 01:14:23 UTC (rev 928)
@@ -538,7 +538,10 @@
notice.z_recipient=recipient;
}
notice.z_default_format="Class $class, Instance $instance:\nTo: @bold($recipient) at $time $date\nFrom: @bold{$1 <$sender>}\n\n$2";
- notice.z_sender=NULL;
+ if (*owl_global_get_zsender(&g))
+ notice.z_sender=owl_global_get_zsender(&g);
+ else
+ notice.z_sender=NULL;
if (opcode) notice.z_opcode=opcode;
notice.z_message_len=strlen(zsig)+1+strlen(message);
