# HG changeset patch
# User Dominic Cleal <dominic@computerkb.co.uk>
# Date 1228604098 0
# Node ID 1d57373d1c04d7378a814ad4a1252dd21f55dc59
# Parent  7bcc70b2121aabea3581528b8f3ce889b5338fce# Parent  db2e2a751dd6e48e3419d75161824762b5f122e0
Merging in df's branch

diff -r 7bcc70b2121a -r 1d57373d1c04 .hgignore
--- a/.hgignore	Sat Dec 06 22:54:12 2008 +0000
+++ b/.hgignore	Sat Dec 06 22:54:58 2008 +0000
@@ -1,3 +1,4 @@
 skillbot\.conf
 skillbot\.friends
 skillbot\.pid
+~$
diff -r 7bcc70b2121a -r 1d57373d1c04 skillbot.pl
--- a/skillbot.pl	Sat Dec 06 22:54:12 2008 +0000
+++ b/skillbot.pl	Sat Dec 06 22:54:58 2008 +0000
@@ -127,7 +127,7 @@
 =cut
 sub init_timers
 {
-	# Join channels fort eh first time, ~15 secs after connect
+	# Join channels for the first time, ~15 secs after connect
 	add_one_shot_timer(15, sub { my ($timer, $self) = @_; join_channels($self); });
 
 	# Check we are in the right channels every 10 minutes
@@ -296,8 +296,7 @@
 {
 	my ($self, $event) = @_;
 
-	my $vstring = sprintf("VERSION twitfolk v%s " .
-		"(\002grifferz\002 is responsible for this atrocity)", $version);
+	my $vstring = sprintf("VERSION %s", $ircname);
 
 	$self->ctcp_reply($event->nick, $vstring);
 }
@@ -398,19 +397,19 @@
 				
 				if (defined $c && $loaded eq 0)
 				{
-					irc_debug("EVE: Unable to find character %s for ID %lu",
+					irc_debug("Unable to find character %s for ID %lu",
 							  $c, $uid);
 					next;
 				}
 
 				$frienduids{$uid} = $loaded;
-				irc_debug("EVE: Adding new friend %s (%lu), %lu characters",
+				irc_debug("Adding new friend %s (%lu), %lu characters",
 						  $nick, $uid, $loaded);
 			}
 		}
 	}
 
-	close(FF) or warn "Something weird when closing friends_file: $!";
+	close(FF) or warn "Something weird occured when closing friends_file: $!";
 }
 
 =pod