From 5c73a3e74548fef8eddbf602d26873ce9a69f58c Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 25 Jul 2012 18:30:55 +0000 Subject: [PATCH 1/2] See ChangeLog. Monotone-Parent: a860eef99344cc9894f15336b3781ecf101807e4 Monotone-Revision: e4cb9e3d176a6344fdd81d88e8df6109f468d9b2 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-07-25T18:30:55 --- ChangeLog | 4 ++++ SoObjects/Mailer/SOGoMailFolder.m | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 436e5362a..75c27fef1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-07-25 Francis Lachapelle + * SoObjects/Mailer/SOGoMailFolder.m + (-deleteUIDs:useTrashFolder:inContext:): fixed comparison with the + trash folder name when using subfolders (ex: INBOX/Trash). + * SoObjects/SOGo/SOGoSieveManager.m (-updateFiltersForLogin:authname:password:account:): write the filters before the vacation auto-reply. diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index 393588c3a..1bf4c6a30 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -406,7 +406,7 @@ static NSString *defaultUserID = @"anyone"; // If we are deleting messages within the Trash folder itself, we // do not, of course, try to move messages to the Trash folder. - if ([folderName isEqualToString: [self relativeImap4Name]]) + if ([folderName isEqualToString: [imap4 imap4FolderNameForURL: [self imap4URL]]]) { *withTrash = NO; } From 4fd57d173b18d46baae3450f85ee4d6eef24957f Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Wed, 25 Jul 2012 19:14:40 +0000 Subject: [PATCH 2/2] Remove OpenChange references in debian rules + control Monotone-Parent: e4cb9e3d176a6344fdd81d88e8df6109f468d9b2 Monotone-Revision: f4ba8f9b9e95c37f5efc0f2b75a7a8968237c3ca Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-07-25T19:14:40 --- debian-multiarch/control | 14 -------------- debian-multiarch/rules | 22 ---------------------- debian/rules | 22 ---------------------- 3 files changed, 58 deletions(-) diff --git a/debian-multiarch/control b/debian-multiarch/control index 1f861a83f..0f1790b3e 100644 --- a/debian-multiarch/control +++ b/debian-multiarch/control @@ -35,20 +35,6 @@ Description: a modern and scalable groupware - development files . This package contains the development files for developing SOGo modules. -Package: sogo-openchange -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Section: net -Priority: extra -Architecture: any -Depends: sogo (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: a modern and scalable groupware - OpenChange backend - SOGo is a groupware server built around OpenGroupware.org (OGo) and - the SOPE application server with focus on scalability. - . - This package contains the backend plugin for using SOGo as a backend - to OpenChange. - Package: sogo-dbg Section: debug Priority: extra diff --git a/debian-multiarch/rules b/debian-multiarch/rules index 6f06fb1ac..edfc67f6f 100755 --- a/debian-multiarch/rules +++ b/debian-multiarch/rules @@ -20,9 +20,6 @@ build-arch: build-arch-stamp build-arch-stamp: config.make # Add here commands to compile the arch part of the package. $(MAKE) - if pkg-config --atleast-version=1.0 libmapi; \ - then (cd OpenChange; $(MAKE)); \ - fi touch $@ clean: @@ -34,15 +31,8 @@ clean: -find Tests -name "*.pyc" -exec rm -f {} \; if [ -f config.make ]; \ then \ - if pkg-config --atleast-version=1.0 libmapi; \ - then \ - (cd OpenChange; make clean); \ - fi; \ make clean; \ fi - -rm -f OpenChange/MAPIStorePropertySelectors.* - -find OpenChange -type d -name "unrtf-*" -exec rm -rf {} \; - -rm -f OpenChange/unrtf*-stamp -rm -f config.make dh_clean @@ -60,18 +50,6 @@ install-arch: build-arch # dh_installdirs -s $(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install - if pkg-config --atleast-version=1.0 libmapi; \ - then \ - (cd OpenChange; \ - $(MAKE) \ - DESTDIR=$(DESTDIR) \ - GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \ - install); \ - rm -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so.1; \ - rm -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so; \ - mv -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so.1.0.0 \ - $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/SOGo.so; \ - fi mkdir -p debian/tmp/etc/default cp Scripts/sogo-default debian/tmp/etc/default/sogo diff --git a/debian/rules b/debian/rules index b3b41ce65..4f2ffd513 100755 --- a/debian/rules +++ b/debian/rules @@ -19,9 +19,6 @@ build-arch: build-arch-stamp build-arch-stamp: config.make # Add here commands to compile the arch part of the package. $(MAKE) - if pkg-config --atleast-version=1.0 libmapi; \ - then (cd OpenChange; $(MAKE)); \ - fi touch $@ clean: @@ -33,15 +30,8 @@ clean: -find Tests -name "*.pyc" -exec rm -f {} \; if [ -f config.make ]; \ then \ - if pkg-config --atleast-version=1.0 libmapi; \ - then \ - (cd OpenChange; make clean); \ - fi; \ make clean; \ fi - -rm -f OpenChange/MAPIStorePropertySelectors.* - -find OpenChange -type d -name "unrtf-*" -exec rm -rf {} \; - -rm -f OpenChange/unrtf*-stamp -rm -f config.make dh_clean @@ -59,18 +49,6 @@ install-arch: build-arch # dh_installdirs -s $(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install - if pkg-config --atleast-version=1.0 libmapi; \ - then \ - (cd OpenChange; \ - $(MAKE) \ - DESTDIR=$(DESTDIR) \ - GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \ - install); \ - rm -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so.1; \ - rm -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so; \ - mv -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so.1.0.0 \ - $(DESTDIR)/usr/lib/mapistore_backends/SOGo.so; \ - fi mkdir -p debian/tmp/etc/default cp Scripts/sogo-default debian/tmp/etc/default/sogo