wibble

diff --git a/imapsync b/imapsync
index a8c786c45b276668c1513804bc4daee464003e66..a759250c6e7664ae980b6e81e1c3497adfafa8c2 100755 (executable)
--- a/imapsync
+++ b/imapsync
@@ -530,13 +530,13 @@ my $STH_GET_CACHE_BY_IDX = $DBH->prepare(q{
 my $STH_GET_INDEX = $DBH->prepare(q{SELECT idx FROM mailboxes WHERE mailbox = ?});
 
 # Find local/remote UID from the map.
-my $STH_GET_LOCAL_UID  = $DBH->prepare("SELECT lUID FROM mapping WHERE idx = ? and rUID = ?");
-my $STH_GET_REMOTE_UID = $DBH->prepare("SELECT rUID FROM mapping WHERE idx = ? and lUID = ?");
+my $STH_GET_LOCAL_UID  = $DBH->prepare(q{SELECT lUID FROM mapping WHERE idx = ? and rUID = ?});
+my $STH_GET_REMOTE_UID = $DBH->prepare(q{SELECT rUID FROM mapping WHERE idx = ? and lUID = ?});
 
 # Delete a (idx,lUID,rUID) association.
 # /!\ Don't commit before the messages have actually been EXPUNGEd on
 #     both sides!
-my $STH_DELETE_MAPPING = $DBH->prepare("DELETE FROM mapping WHERE idx = ? and lUID = ?");
+my $STH_DELETE_MAPPING = $DBH->prepare(q{DELETE FROM mapping WHERE idx = ? and lUID = ?});
 
 # Update the HIGHESTMODSEQ.
 my $STH_UPDATE_LOCAL_HIGHESTMODSEQ  = $DBH->prepare(q{UPDATE local  SET HIGHESTMODSEQ = ? WHERE idx = ?});

diff --git a/lib/Net/IMAP/Sync.pm b/lib/Net/IMAP/Sync.pm
index 21e2fa86e850142a5fa733751c82302af357eb15..11bfba4a76a8e197c2e8de3ba71585de16b8d499 100644 (file)
--- a/lib/Net/IMAP/Sync.pm
+++ b/lib/Net/IMAP/Sync.pm
@@ -405,8 +405,7 @@ sub log($@) {
     $prefix .= " $self->{name}" if defined $self->{name};
     $prefix .= "($self->{_SELECTED})" if $self->{_STATE} eq 'SELECTED';
     $prefix .= ': ';
-    my $stderr = $self->{STDERR};
-    print $stderr $prefix, @_, "\n";
+    $self->{STDERR}->say($prefix, @_);
 }