diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.h b/SoObjects/Appointments/SOGoAppointmentFolder.h
index b09241cfd..05e760909 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -80,7 +80,7 @@ typedef enum {
- (NSArray *) calendarUIDs;
-- (NSString *) activeTasks;
+- (NSNumber *) activeTasks;
/* vevent UID handling */
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index a70a0eb16..0a8746083 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -3269,11 +3269,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
return users;
}
-- (NSString *) activeTasks
+- (NSNumber *) activeTasks
{
NSArray *tasksList;
- NSString *activeTasks;
NSMutableArray *fields;
+ NSNumber *activeTasks;
fields = [NSMutableArray arrayWithObjects: @"c_component", @"c_status", nil];
@@ -3284,8 +3284,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
component: @"vtodo"
additionalFilters: @"c_status != 2 AND c_status != 3"];
- activeTasks = [NSString stringWithFormat:@"(%d)", [tasksList count]];
-
+ activeTasks = [NSNumber numberWithInt:[tasksList count]];
+
return activeTasks;
}
diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m
index 196299fad..fd9e99c76 100644
--- a/UI/Scheduler/UIxCalendarSelector.m
+++ b/UI/Scheduler/UIxCalendarSelector.m
@@ -92,8 +92,8 @@ _intValueFromHex (NSString *hexString)
SOGoAppointmentFolder *folder;
NSMutableDictionary *calendar;
unsigned int count, max;
- NSString *folderName, *fDisplayName, *fActiveTasks;
- NSNumber *isActive;
+ NSString *folderName, *fDisplayName;
+ NSNumber *isActive, *fActiveTasks;
if (!calendars)
{
@@ -122,7 +122,7 @@ _intValueFromHex (NSString *hexString)
forKey: @"owner"];
fActiveTasks = [folder activeTasks];
if (fActiveTasks == nil)
- fActiveTasks = @"";
+ fActiveTasks = 0;
[calendar setObject:fActiveTasks forKey:@"activeTasks" ];
[calendars addObject: calendar];
}
diff --git a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
index e5f0b03e6..5b3bd488e 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -39,10 +39,8 @@ div.colorBox.calendarFolder