From 6c5aef32369d6ec6eb99b1d3e63992a14bf84c99 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 30 Dec 2010 14:44:19 +0000
Subject: [PATCH] Monotone-Parent: 12e34f1abc38bd31c7787cad3e2c4cdcbf106a13
 Monotone-Revision: eebb10325c95cf3524a8521ef34f3a6f10e91cf7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-12-30T14:44:19
Monotone-Branch: ca.inverse.sogo
---
 OpenChange/MAPIStoreCommonViewsContext.m | 7 -------
 OpenChange/MAPIStoreFreebusyContext.m    | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/OpenChange/MAPIStoreCommonViewsContext.m b/OpenChange/MAPIStoreCommonViewsContext.m
index 9fbf61e30..6b711a233 100644
--- a/OpenChange/MAPIStoreCommonViewsContext.m
+++ b/OpenChange/MAPIStoreCommonViewsContext.m
@@ -22,17 +22,10 @@
 
 #import <Foundation/NSString.h>
 
-#import <NGExtensions/NSObject+Logs.h>
-
 #import "MAPIStoreMapping.h"
 
 #import "MAPIStoreCommonViewsContext.h"
 
-// #undef DEBUG
-// #include <mapistore/mapistore.h>
-// #include <mapistore/mapistore_errors.h>
-// #include <libmapiproxy.h>
-
 @implementation MAPIStoreCommonViewsContext
 
 + (NSString *) MAPIModuleName
diff --git a/OpenChange/MAPIStoreFreebusyContext.m b/OpenChange/MAPIStoreFreebusyContext.m
index 8b3f9e9eb..b6813e167 100644
--- a/OpenChange/MAPIStoreFreebusyContext.m
+++ b/OpenChange/MAPIStoreFreebusyContext.m
@@ -45,7 +45,7 @@
 
 - (void) setupModuleFolder
 {
-  id userFolder;
+  SOGoUserFolder *userFolder;
 
   userFolder = [SOGoUserFolder objectWithName: [authenticator username]
                                   inContainer: MAPIApp];