[1017] in BarnOwl Developers
[D-O-H] r1002 - in branches/barnowl_sqlite: . owl owl/perl/modules/IRC/lib/BarnOwl/Module
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:12:10 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: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 31 Mar 2008 11:53:16 -0400 (EDT)
Author: nelhage
Date: 2008-03-31 11:53:16 -0400 (Mon, 31 Mar 2008)
New Revision: 1002
Modified:
branches/barnowl_sqlite/
branches/barnowl_sqlite/owl/Makefile.in
branches/barnowl_sqlite/owl/global.c
branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
branches/barnowl_sqlite/owl/svkversion
Log:
Merged revisions 995-1001 via svnmerge from
svn+ssh://lunatique.mit.edu/mit/barnowl/src/svn/trunk
........
r998 | geofft | 2008-03-31 01:59:47 -0400 (Mon, 31 Mar 2008) | 1 line
Implement /me for outgoing IRC messages
........
r999 | geofft | 2008-03-31 09:58:56 -0400 (Mon, 31 Mar 2008) | 1 line
I think this fixes the resizing bug.
........
r1000 | nelhage | 2008-03-31 11:29:29 -0400 (Mon, 31 Mar 2008) | 2 lines
Make `svkversion' handle exported trees better
........
r1001 | nelhage | 2008-03-31 11:52:39 -0400 (Mon, 31 Mar 2008) | 2 lines
Add a makefile rule to support emacs flymake-mode
........
Property changes on: branches/barnowl_sqlite
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-994
+ /trunk:1-1001
Modified: branches/barnowl_sqlite/owl/Makefile.in
===================================================================
--- branches/barnowl_sqlite/owl/Makefile.in 2008-03-31 15:52:39 UTC (rev 1001)
+++ branches/barnowl_sqlite/owl/Makefile.in 2008-03-31 15:53:16 UTC (rev 1002)
@@ -103,7 +103,7 @@
mv -f owl_prototypes.h.new $@; }
#owl_prototypes.h:
-.PHONY: tags clean distclean proto test
+.PHONY: tags clean distclean proto test check-syntax
tags: TAGS
@@ -137,3 +137,7 @@
installdirs: mkinstalldirs
${srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man1 ${DESTDIR}${datadir}
+
+# For emacs flymake-mode
+check-syntax: proto
+ $(CC) $(CFLAGS) -Wall -Wextra -pedantic -fsyntax-only $(CHK_SOURCES)
Modified: branches/barnowl_sqlite/owl/global.c
===================================================================
--- branches/barnowl_sqlite/owl/global.c 2008-03-31 15:52:39 UTC (rev 1001)
+++ branches/barnowl_sqlite/owl/global.c 2008-03-31 15:53:16 UTC (rev 1002)
@@ -464,6 +464,7 @@
owl_mainwin_redisplay(&(g->mw));
sepbar(NULL);
owl_editwin_redisplay(&(g->tw), 0);
+ owl_function_full_redisplay(&g);
/* TODO: this should handle other forms of popwins */
if (owl_popwin_is_active(owl_global_get_popwin(g))
Modified: branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-03-31 15:52:39 UTC (rev 1001)
+++ branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-03-31 15:53:16 UTC (rev 1002)
@@ -208,7 +208,12 @@
my $body = shift;
# Strip whitespace. In the future -- send one message/line?
$body =~ tr/\n\r/ /;
- $conn->conn->privmsg($to, $body);
+ if ($body =~ /^\/me (.*)/) {
+ $conn->conn->me($to, $1);
+ $body = BarnOwl::Style::boldify($conn->nick.' '.$1);
+ } else {
+ $conn->conn->privmsg($to, $body);
+ }
my $msg = BarnOwl::Message->new(
type => 'IRC',
direction => is_private($to) ? 'out' : 'in',
Modified: branches/barnowl_sqlite/owl/svkversion
===================================================================
--- branches/barnowl_sqlite/owl/svkversion 2008-03-31 15:52:39 UTC (rev 1001)
+++ branches/barnowl_sqlite/owl/svkversion 2008-03-31 15:53:16 UTC (rev 1002)
@@ -14,7 +14,11 @@
my $p = shift @ARGV;
$p ||= ".";
-my @lines = `svk info $p`;
+my @lines = `svk info $p 2>&1`;
+if($! || $lines[0] =~ "not a checkout path") {
+ print "exported$newline";
+ exit;
+}
my @merged = grep {/^Merged From: /} @lines;
unless (@merged) {
