[popfile-commit] engine/Services IMAP.pm,1.9.4.18,1.9.4.19

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30858/Services

Modified Files:
      Tag: b0_22_2
	IMAP.pm 
Log Message:
First step toward squashing bug 1886551: can_reclassify checks whether the target bucket is a pseudo-bucket.


Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.9.4.18
retrieving revision 1.9.4.19
diff -C2 -d -r1.9.4.18 -r1.9.4.19
*** IMAP.pm	2 Dec 2007 09:35:09 -0000	1.9.4.18
--- IMAP.pm	4 Feb 2008 20:25:51 -0000	1.9.4.19
***************
*** 339,344 ****
  
      # watched folders
!     foreach ( $self->watched_folders__() ) {
!         $self->{folders__}{$_}{watched} = 1;
      }
  
--- 339,344 ----
  
      # watched folders
!     foreach my $folder ( $self->watched_folders__() ) {
!         $self->{folders__}{$folder}{watched} = 1;
      }
  
***************
*** 616,620 ****
      # make the flags more accessible.
      my $is_watched = ( exists $self->{folders__}{$folder}{watched} ) ? 1 : 0;
!     my $is_output = ( exists $self->{folders__}{$folder}{output} ) ? $self->{folders__}{$folder}{output} : '';
  
      $self->log_( 1, "Looking for new messages in folder $folder." );
--- 616,620 ----
      # make the flags more accessible.
      my $is_watched = ( exists $self->{folders__}{$folder}{watched} ) ? 1 : 0;
!     my $is_output  = ( exists $self->{folders__}{$folder}{output } ) ? $self->{folders__}{$folder}{output} : '';
  
      $self->log_( 1, "Looking for new messages in folder $folder." );
***************
*** 1173,1177 ****
                  # new and old bucket must be different
                  if ( $new_bucket ne $bucket ) {
!                     return $bucket;
                  }
                  else {
--- 1173,1184 ----
                  # new and old bucket must be different
                  if ( $new_bucket ne $bucket ) {
! 
!                     # The new bucket must not be a pseudo-bucket
!                     if ( ! $self->classifier()->is_pseudo_bucket( $self->api_session(), $new_bucket ) ) {
!                         return $bucket;
!                     }
!                     else {
!                         $self->log_( 1, "Will not reclassify to pseudo-bucket ($new_bucket)" );
!                     }
                  }
                  else {