From cf289984670d4b3a725c6341e0c904e2292cb279 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 11 Jul 2008 17:32:59 +0000
Subject: [PATCH] Monotone-Parent: ff35c4a69655239a569e90ab2fcc971a46c7b83f
 Monotone-Revision: ff087e7476d15851d3c25585e3b00d2b2bf705cc

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-11T17:32:59
Monotone-Branch: ca.inverse.sogo
---
 UI/Scheduler/GNUmakefile          |  4 ++--
 UI/Scheduler/UIxCalDateSelector.m | 11 ++++++++---
 UI/Scheduler/UIxCalMainView.m     | 24 ++++++++++--------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index be6f42394..30e4b7e51 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -35,9 +35,9 @@ SchedulerUI_OBJC_FILES =		\
 	UIxComponentEditor.m		\
 	UIxCalendarSelector.m		\
 	UIxAppointmentEditor.m		\
-	UIxAppointmentProposal.m	\
+# 	UIxAppointmentProposal.m	\
 	UIxTaskEditor.m		\
-	UIxTaskProposal.m	\
+# 	UIxTaskProposal.m	\
 	UIxCalDateLabel.m		\
 	UIxDatePicker.m			\
 	UIxTimeDateControl.m		\
diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m
index bfb2efc1f..139b7c4ac 100644
--- a/UI/Scheduler/UIxCalDateSelector.m
+++ b/UI/Scheduler/UIxCalDateSelector.m
@@ -151,9 +151,14 @@
 
 - (NSString *) extraStyle
 {
-  return (([[self selectedDate] isDateOnSameDay: currentDay])
-          ? [self selectedDayExtraStyle]
-          : nil);
+  NSString *extraStyle;
+
+  if ([[self selectedDate] isDateOnSameDay: currentDay])
+    extraStyle = [self selectedDayExtraStyle];
+  else
+    extraStyle = nil;
+
+  return extraStyle;
 }
 
 /* URLs */
diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m
index d0939c643..1ffa77a92 100644
--- a/UI/Scheduler/UIxCalMainView.m
+++ b/UI/Scheduler/UIxCalMainView.m
@@ -126,32 +126,28 @@ static NSMutableArray *yearMenuItems = nil;
 
 - (NSString *) verticalDragHandleStyle
 {
-   NSString *vertical;
+  [self _setupContext];
 
-   [self _setupContext];
-   vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
-   
-   return (vertical ? [vertical stringByAppendingFormat: @"px"] : nil);
+  return [[moduleSettings objectForKey: @"DragHandleVertical"]
+	   stringByAppendingString: @"px"];
 }
 
 - (NSString *) horizontalDragHandleStyle
 {
-   NSString *horizontal;
+  [self _setupContext];
 
-   [self _setupContext];
-   horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
-
-   return (horizontal ? [horizontal stringByAppendingFormat: @"px"] : nil);
+  return [[moduleSettings objectForKey: @"DragHandleHorizontal"]
+	   stringByAppendingString: @"px"];
 }
 
 - (NSString *) eventsListViewStyle
 {
-   NSString *height;
+  NSString *height;
 
-   [self _setupContext];
-   height = [moduleSettings objectForKey: @"DragHandleVertical"];
+  [self _setupContext];
+  height = [moduleSettings objectForKey: @"DragHandleVertical"];
 
-   return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
+  return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
 }
 
 - (WOResponse *) saveDragHandleStateAction