[978] in BarnOwl Developers
[D-O-H] r964 - in branches/barnowl_unicode: . owl owl/perl/modules/IRC/lib/BarnOwl/Module/IRC
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:11:47 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: Fri, 22 Feb 2008 10:59:42 -0500 (EST)
Author: asedeno
Date: 2008-02-22 10:59:41 -0500 (Fri, 22 Feb 2008)
New Revision: 964
Modified:
branches/barnowl_unicode/
branches/barnowl_unicode/owl/
branches/barnowl_unicode/owl/global.c
branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
Log:
Merged revisions 958-963 via svnmerge from
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk
........
r960 | chmrr | 2008-02-19 20:48:44 -0500 (Tue, 19 Feb 2008) | 3 lines
r2008@utwig: chmrr | 2008-02-19 20:48:27 -0500
* Fix admin messages
........
r963 | asedeno | 2008-02-22 10:58:32 -0500 (Fri, 22 Feb 2008) | 1 line
resize should always refresh the editwin.
........
Property changes on: branches/barnowl_unicode
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-957
+ /trunk:1-963
Property changes on: branches/barnowl_unicode/owl
___________________________________________________________________
Name: svk:merge
- 06e3988a-d725-0410-af47-c5dd11e74598:/local/barnowl:1876
8baf6839-b125-0410-9df9-922793c80423:/local/barnowl:20981
8baf6839-b125-0410-9df9-922793c80423:/local/owl:15641
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/branches/par:19594
fe09232e-8620-0410-8e36-e6b4839e121d:/branches/par:688
+ 06e3988a-d725-0410-af47-c5dd11e74598:/local/barnowl:2008
8baf6839-b125-0410-9df9-922793c80423:/local/barnowl:20981
8baf6839-b125-0410-9df9-922793c80423:/local/owl:15641
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/branches/par:19594
fe09232e-8620-0410-8e36-e6b4839e121d:/branches/par:688
Modified: branches/barnowl_unicode/owl/global.c
===================================================================
--- branches/barnowl_unicode/owl/global.c 2008-02-22 15:58:32 UTC (rev 963)
+++ branches/barnowl_unicode/owl/global.c 2008-02-22 15:59:41 UTC (rev 964)
@@ -443,10 +443,8 @@
g->needrefresh=1;
owl_mainwin_redisplay(&(g->mw));
sepbar(NULL);
+ owl_editwin_redisplay(&(g->tw), 0);
- if (owl_global_is_typwin_active(g)) {
- owl_editwin_redisplay(&(g->tw), 0);
- }
/* TODO: this should handle other forms of popwins */
if (owl_popwin_is_active(owl_global_get_popwin(g))
&& owl_global_get_viewwin(g)) {
Modified: branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
===================================================================
--- branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-02-22 15:58:32 UTC (rev 963)
+++ branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-02-22 15:59:41 UTC (rev 964)
@@ -124,7 +124,7 @@
my ($self, $evt) = @_;
BarnOwl::admin_message("IRC",
BarnOwl::Style::boldify('IRC ' . $evt->type . ' message from '
- . $evt->alias) . "\n"
+ . $self->alias) . "\n"
. strip_irc_formatting(join '\n', cdr $evt->args));
}