[1010] in BarnOwl Developers
[D-O-H] r995 - in branches/barnowl_sqlite: . owl owl/perl/lib/BarnOwl owl/perl/modules/IRC/lib/BarnOwl/Module owl/perl/modules/IRC/lib/BarnOwl/Module/IRC owl/perl/modules/Jabber/lib/BarnOwl/Module
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:12:06 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: Sat, 29 Mar 2008 17:11:14 -0400 (EDT)
Author: nelhage
Date: 2008-03-29 17:11:14 -0400 (Sat, 29 Mar 2008)
New Revision: 995
Modified:
branches/barnowl_sqlite/
branches/barnowl_sqlite/owl/Makefile.in
branches/barnowl_sqlite/owl/commands.c
branches/barnowl_sqlite/owl/keys.c
branches/barnowl_sqlite/owl/owl.c
branches/barnowl_sqlite/owl/perl/lib/BarnOwl/ModuleLoader.pm
branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
Log:
Merged revisions 984-994 via svnmerge from
svn+ssh://lunatique.mit.edu/mit/barnowl/src/svn/trunk
........
r985 | nelhage | 2008-03-11 12:38:20 -0400 (Tue, 11 Mar 2008) | 2 lines
Generate less ugly error spew if a module fails to load
........
r986 | geofft | 2008-03-13 15:56:20 -0400 (Thu, 13 Mar 2008) | 1 line
Added :webzephyr command with keybinding W.
........
r987 | asedeno | 2008-03-18 23:57:24 -0400 (Tue, 18 Mar 2008) | 2 lines
Fix a race condition in which zephyrs received during init
are not noticed until the next zephyr after entering the mainloop.
........
r988 | geofft | 2008-03-19 15:46:43 -0400 (Wed, 19 Mar 2008) | 6 lines
IRC: explicitly include the network (-a $alias) in reply commands.
This may be unnecessary because :irc-msg looks at getcurmsg() if it cannot
automatically determine the network.
........
r989 | geofft | 2008-03-21 14:47:51 -0400 (Fri, 21 Mar 2008) | 1 line
syntax error.
........
r990 | nelhage | 2008-03-26 02:24:26 -0400 (Wed, 26 Mar 2008) | 2 lines
Fix sending jabbers to JIDs beginning with `+'
........
r994 | nelhage | 2008-03-29 17:02:05 -0400 (Sat, 29 Mar 2008) | 3 lines
Compile zcrypt.c with -w so I don't get all these warnings in my
compile output whenever I change any headers
........
Property changes on: branches/barnowl_sqlite
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-983
+ /trunk:1-994
Modified: branches/barnowl_sqlite/owl/Makefile.in
===================================================================
--- branches/barnowl_sqlite/owl/Makefile.in 2008-03-29 21:02:05 UTC (rev 994)
+++ branches/barnowl_sqlite/owl/Makefile.in 2008-03-29 21:11:14 UTC (rev 995)
@@ -46,15 +46,20 @@
HEADERS=$(GEN_H) owl.h owl_perl.h config.h test.h
-%.o: %.c $(HEADERS)
- $(CC) -c $(CFLAGS) $< -o $@
-
$(EXE): $(AUTOGEN) $(OBJS) owl.o libfaim
$(ATHSTATIC) $(CC) -o $(EXE) owl.o $(OBJS) $(LDFLAGS) $(LIBS)
tester: $(AUTOGEN) $(OBJS) tester.o
$(ATHSTATIC) $(CC) -o tester tester.o $(OBJS) $(LDFLAGS) $(LIBS)
+%.o: %.c $(HEADERS)
+ $(CC) -c $(CFLAGS) $< -o $@
+
+# zcrypt is old crufty DES code I don't want to touch
+# Disable all warnings when compiling it
+zcrypt.o: zcrypt.c $(HEADERS)
+ $(CC) -c $(CFLAGS) $< -w -o $@
+
test: tester
./tester reg
@@ -105,8 +110,7 @@
TAGS: $(BASE_SRCS) $(OWL_SRC) $(TESTER_SRC) $(GEN_C) owl.h $(GEN_H)
etags $(BASE_SRCS) $(OWL_SRC) $(TESTER_SRC) $(GEN_C) owl.h $(GEN_H)
-$(BASE_OBJS) varstubs.h:: owl.h config.h owl_prototypes.h
-#$(BASE_OBJS) varstubs.h:: owl.h config.h
+$(BASE_OBJS) varstubs.h: owl.h config.h owl_prototypes.h
libfaim: libfaim/libfaim.a
Modified: branches/barnowl_sqlite/owl/commands.c
===================================================================
--- branches/barnowl_sqlite/owl/commands.c 2008-03-29 21:02:05 UTC (rev 994)
+++ branches/barnowl_sqlite/owl/commands.c 2008-03-29 21:11:14 UTC (rev 995)
@@ -962,6 +962,8 @@
"exits the popless window",
"", ""),
+ OWLCMD_ALIAS("webzephyr", "zwrite daemon.webzephyr -c webzephyr -i"),
+
/* This line MUST be last! */
{ NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
Modified: branches/barnowl_sqlite/owl/keys.c
===================================================================
--- branches/barnowl_sqlite/owl/keys.c 2008-03-29 21:02:05 UTC (rev 994)
+++ branches/barnowl_sqlite/owl/keys.c 2008-03-29 21:11:14 UTC (rev 995)
@@ -280,6 +280,8 @@
BIND_CMD("w", "openurl", "open a URL using a webbrowser");
+ BIND_CMD("W", "start-command webzephyr ", "start a webzephyr command");
+
BIND_CMD("C-c", "", "no effect in this mode");
BIND_CMD("C-g", "", "no effect in this mode");
Modified: branches/barnowl_sqlite/owl/owl.c
===================================================================
--- branches/barnowl_sqlite/owl/owl.c 2008-03-29 21:02:05 UTC (rev 994)
+++ branches/barnowl_sqlite/owl/owl.c 2008-03-29 21:11:14 UTC (rev 995)
@@ -434,6 +434,11 @@
nexttimediff=10;
nexttime=time(NULL);
+#ifdef HAVE_LIBZEPHYR
+ /* Check for any zephyrs that have come in while we've done init. */
+ owl_zephyr_process_events();
+#endif
+
owl_function_debugmsg("startup: entering main loop");
/* main loop */
while (1) {
Modified: branches/barnowl_sqlite/owl/perl/lib/BarnOwl/ModuleLoader.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/lib/BarnOwl/ModuleLoader.pm 2008-03-29 21:02:05 UTC (rev 994)
+++ branches/barnowl_sqlite/owl/perl/lib/BarnOwl/ModuleLoader.pm 2008-03-29 21:11:14 UTC (rev 995)
@@ -39,7 +39,7 @@
for my $class (keys %modules) {
if(!defined eval "use BarnOwl::Module::$class") {
# BarnOwl::error("Unable to load module $class: $!") if $!;
- BarnOwl::error("Unable to load module $class: $@") if $@;
+ BarnOwl::error("Unable to load module $class: \n$@\n") if $@;
}
}
Modified: branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-03-29 21:02:05 UTC (rev 994)
+++ branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-03-29 21:11:14 UTC (rev 995)
@@ -107,9 +107,9 @@
(notice => 'true') : (),
is_private($recipient) ?
(isprivate => 'true') : (channel => $recipient),
- replycmd => 'irc-msg ' .
+ replycmd => 'irc-msg -a ' . $self->alias . ' ' .
(is_private($recipient) ? $evt->nick : $recipient),
- replysendercmd => 'irc-msg ' . $evt->nick
+ replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
);
BarnOwl::queue_message($msg);
@@ -157,6 +157,8 @@
my $msg = $self->new_message($evt,
loginout => 'login',
channel => $evt->to,
+ replycmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick,
+ replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
);
BarnOwl::queue_message($msg);
}
@@ -166,6 +168,8 @@
my $msg = $self->new_message($evt,
loginout => 'logout',
channel => $evt->to,
+ replycmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick,
+ replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
);
BarnOwl::queue_message($msg);
}
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-29 21:02:05 UTC (rev 994)
+++ branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-03-29 21:11:14 UTC (rev 995)
@@ -198,7 +198,7 @@
if(@_) {
process_msg($conn, $to, join(" ", @_));
} else {
- BarnOwl::start_edit_win("/msg $to -a " . $conn->alias, sub {process_msg($conn, $to, @_)});
+ BarnOwl::start_edit_win("/msg -a " . $conn->alias . " $to", sub {process_msg($conn, $to, @_)});
}
}
@@ -219,8 +219,8 @@
sender => $conn->nick,
is_private($to) ?
(isprivate => 'true') : (channel => $to),
- replycmd => "irc-msg $to",
- replysendercmd => "irc-msg $to"
+ replycmd => "irc-msg -a " . $conn->alias . " $to",
+ replysendercmd => "irc-msg -a " . $conn->alias . " $to"
);
BarnOwl::queue_message($msg);
}
Modified: branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-03-29 21:02:05 UTC (rev 994)
+++ branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-03-29 21:11:14 UTC (rev 995)
@@ -24,6 +24,7 @@
use Net::Jabber::MUC;
use Net::DNS;
use Getopt::Long;
+Getopt::Long::Configure(qw(no_getopt_compat prefix_pattern="-|--"));
our $VERSION = 0.1;
@@ -476,7 +477,7 @@
'subject=s' => \$jwrite_subject,
'account=s' => \$from,
'id=s' => \$jwrite_sid,
- );
+ ) or die("Usage: jwrite JID [-t thread] [-s 'subject'] [-a account]\n");
$jwrite_type = 'groupchat' if $gc;
if ( scalar @ARGV != 1 ) {
@@ -566,7 +567,7 @@
}
my $getopt = Getopt::Long::Parser->new;
- $getopt->configure('pass_through');
+ $getopt->configure('pass_through', 'no_getopt_compat');
$getopt->getoptions( 'account=s' => \$jid );
$jid ||= defaultJID();
if ($jid) {
@@ -730,7 +731,7 @@
my @groups;
my $purgeGroups;
my $getopt = Getopt::Long::Parser->new;
- $getopt->configure('pass_through');
+ $getopt->configure('pass_through', 'no_getopt_compat');
$getopt->getoptions(
'account=s' => \$jid,
'group=s' => \@groups,
