Monotone-Parent: 5066f4418986dc6df8b207002b41f82bc9e2bb8b

Monotone-Revision: 78e21f4d868126d413a1b1a4924181b29cb18052

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-20T21:26:42
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar

@@ -10,7 +10,7 @@
     { link = "#";
       hasMenu = YES;
       label = "Privacy";
-      onclick = "return onSelectPrivacy(event);";
+      onclick = "return onSelectClassification(event);";
       image = "tb-compose-security-flat-24x24.png"; },
     { link = "#";
       label = "Attach";

UI/Scheduler/Toolbars/SOGoTaskObject.toolbar

@@ -6,7 +6,7 @@
     { link = "#";
       hasMenu = YES;
       label = "Privacy";
-      onclick = "return onSelectPrivacy(event);";
+      onclick = "return onSelectClassification(event);";
       image = "tb-compose-security-flat-24x24.png"; },
     { link = "#";
       label = "Attach";

UI/Scheduler/UIxComponentEditor.h

@@ -54,7 +54,7 @@
   NSString *comment;
   NSString *attachUrl;
   NSString *priority;
-  NSString *privacy;
+  NSString *classification;
   NSString *status;
   NSString *category;
   NSArray *categories;
@@ -119,10 +119,10 @@
 - (NSString *) priority;
 - (NSString *) itemPriorityText;
 
-- (NSArray *) privacyClasses;
-- (void) setPrivacy: (NSString *) _privacy;
-- (NSString *) privacy;
-- (NSString *) itemPrivacyText;
+- (NSArray *) classificationClasses;
+- (void) setClassification: (NSString *) _classification;
+- (NSString *) classification;
+- (NSString *) itemClassificationText;
 
 - (void) setStatus: (NSString *) _status;
 - (NSString *) status;

UI/Scheduler/UIxComponentEditor.m

@@ -167,7 +167,7 @@ iRANGE(2);
 
       component = nil;
       componentCalendar = nil;
-      [self setPrivacy: @"PUBLIC"];
+      [self setClassification: @"PUBLIC"];
       [self setIsCycleEndNever];
       componentOwner = @"";
       organizer = nil;
@@ -629,7 +629,7 @@ iRANGE(2);
 	  ASSIGN (location, [component location]);
 	  ASSIGN (comment, [component comment]);
 	  ASSIGN (attachUrl, [[component attach] absoluteString]);
-	  ASSIGN (privacy, [component accessClass]);
+	  ASSIGN (classification, [component accessClass]);
 	  ASSIGN (priority, [component priority]);
 	  ASSIGN (status, [component status]);
           ASSIGN (categories, [component categories]);
@@ -701,7 +701,7 @@ iRANGE(2);
   return [self labelForKey: [NSString stringWithFormat: @"prio_%@", item]];
 }
 
-- (NSString *) itemPrivacyText
+- (NSString *) itemClassificationText
 {
   NSString *tag;
 
@@ -1380,7 +1380,7 @@ iRANGE(2);
   return [priority length] > 0;
 }
 
-- (NSArray *) privacyClasses
+- (NSArray *) classificationClasses
 {
   static NSArray *priorities = nil;
 
@@ -1394,14 +1394,14 @@ iRANGE(2);
   return priorities;
 }
 
-- (void) setPrivacy: (NSString *) _privacy
+- (void) setClassification: (NSString *) _classification
 {
-  ASSIGN (privacy, _privacy);
+  ASSIGN (classification, _classification);
 }
 
-- (NSString *) privacy
+- (NSString *) classification
 {
-  return privacy;
+  return classification;
 }
 
 - (void) setStatus: (NSString *) _status
@@ -2149,7 +2149,7 @@ RANGE(2);
   [component setLocation: location];
   [component setComment: comment];
   [component setAttach: attachUrl];
-  [component setAccessClass: privacy];
+  [component setAccessClass: classification];
   [component setCategories: categories];
   [self _handleAttendeesEdition];
   [self _handleOrganizer];