From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 24 Jul 2015 23:07:10 +0000 (+0200)
Subject: wibble
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=a2e522510b2b5122aa2ba3d120c0f28e2d24ed03;p=interimap.git

wibble
---

diff --git a/imapsync b/imapsync
index 657050d..396b355 100755
--- a/imapsync
+++ b/imapsync
@@ -406,7 +406,7 @@ sub sync_tree($$%) {
         my %mailboxes;
         $mailboxes{$_} = 1 foreach (keys %{$IMAP->{local}->{mailboxes}}, keys %{$IMAP->{remote}->{mailboxes}});
         foreach my $mbx (keys %mailboxes) {
-            die "Could not sync mailbox list.\n" if exists_mbx('local',$mbx) xor exists_mbx('remote',$mbx);
+            die "Couldn't sync mailbox list.\n" if exists_mbx('local',$mbx) xor exists_mbx('remote',$mbx);
         }
     }
 }
@@ -531,8 +531,7 @@ my $STH_GET_LOCAL_UID  = $DBH->prepare(q{SELECT lUID FROM mapping WHERE idx = ?
 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!
+# /!\ Don't commit before the messages have actually been EXPUNGEd on both sides!
 my $STH_DELETE_MAPPING = $DBH->prepare(q{DELETE FROM mapping WHERE idx = ? and lUID = ?});
 
 # Update the HIGHESTMODSEQ.
diff --git a/lib/Net/IMAP/Sync.pm b/lib/Net/IMAP/Sync.pm
index 9882d75..be083f3 100644
--- a/lib/Net/IMAP/Sync.pm
+++ b/lib/Net/IMAP/Sync.pm
@@ -376,7 +376,7 @@ sub new($%) {
         $self->fail("Server did not advertize ENABLE (RFC 5161) capability.") unless $self->_capable('ENABLE');
         $self->_send('ENABLE '.join(' ',@extensions));
         my @enabled = @{$self->{_ENABLED} // []};
-        $self->fail("Could not ENABLE $_") foreach
+        $self->fail("Couldn't ENABLE $_") foreach
             grep {my $e = $_; !grep {uc $e eq uc $_} @enabled} @extensions;
     }
 
@@ -602,7 +602,7 @@ sub remove_message($@) {
 
     $self->log("Removed ".($#expunged+1)." message(s), ".
                "UID ".compact_set(@expunged)) if @expunged and !$self->{quiet};
-    $self->warn("Could not UID EXPUNGE ".compact_set(@failed)) if @failed;
+    $self->warn("Couldn't UID EXPUNGE ".compact_set(@failed)) if @failed;
     return @failed;
 }