From cbf4bc2519f9ed9e1a220dd8fa1c442c59395743 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 14 Jan 2010 22:57:44 +0000
Subject: [PATCH] Monotone-Parent: aada198309b5b9b1d7e6e2f2faade7b2b97c4718
 Monotone-Revision: 04adb21a2d66943bc4fbda82a60f41695303ccfb

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-14T22:57:44
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog              |  5 +++++
 Tools/SOGoToolBackup.m | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7d014fa67..c4de35897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* Tools/SOGoToolBackup.m (-extractUserPreferences:intoRecord:):
+	fixed compilation warning.
+
 2010-01-13  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/ContactsUI.js (-fixSearchFieldPosition):
diff --git a/Tools/SOGoToolBackup.m b/Tools/SOGoToolBackup.m
index 907951d56..3f36727c5 100644
--- a/Tools/SOGoToolBackup.m
+++ b/Tools/SOGoToolBackup.m
@@ -38,7 +38,9 @@
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserProfile.h>
+#import <SOGo/SOGoUserSettings.h>
 
 #import "SOGoToolBackup.h"
 
@@ -341,12 +343,13 @@
 {
   SOGoUser *sogoUser;
   NSArray *preferences;
-  NSDictionary *defaultsValues, *settingsValues;
+  SOGoUserProfile *defaultsSource, *profileSource;
 
   sogoUser = [SOGoUser userWithLogin: uid roles: nil];
-  defaultsValues = [[[sogoUser userDefaults] source] values];
-  settingsValues = [[[sogoUser userSettings] source] values];
-  preferences = [NSArray arrayWithObjects: defaultsValues, settingsValues,
+  defaultsSource = [[sogoUser userDefaults] source];
+  profileSource = [[sogoUser userSettings] source];
+  preferences = [NSArray arrayWithObjects:
+                           [defaultsSource values], [profileSource values],
                          nil];
   [userRecord setObject: preferences forKey: @"preferences"];