fixes

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@214 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index a90e2abf9b340a2dc80c62958ae02c75430ef0bd..a2e32b27b2ec40be9b90d56536bb0bdcfab4b689 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxAppointmentEditor.m: Changed "X-OGo-RESOURCE" into
+         "NON-PARTICIPANT" (v0.9.36)
+
 2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxAppointmentView.[h,m,wox], UIxAppointmentEditor.[h,m,wox]:

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 7f4e6619b653ca8993172b371bb9ce96d0909f49..b3f854066bf0240f0bf0fb0cbd445a3ccefff219 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -339,7 +339,7 @@
 
         /* see RFC2445, sect. 4.2.16 for details */
         if(_isResource) {
-            [p setRole:@"X-OGo-RESOURCE"];
+            [p setRole:@"NON-PARTICIPANT"];
         }
         else {
             [p setRole:@"REQ-PARTICIPANT"];

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index cd172534a3075a5605700afbc00158a14ada0704..4d40cd2fafd119406077d217ee923248571b85ee 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=35
+SUBMINOR_VERSION:=36
 
 # v0.9.31 requires libWEExtensions v4.2.52
 # v0.9.29 requires libWEExtensions v4.2.51

diff --git a/SOGoLogic/ChangeLog b/SOGoLogic/ChangeLog
index f332091bd6773532b3b7f8ac195d23c1f6641b87..d59fe8047039ea04938af3dc2fdd1c9839572755 100644 (file)
--- a/SOGoLogic/ChangeLog
+++ b/SOGoLogic/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxAppointmentEditor.m: changed filter. The iCalSaxDriver doesn't
+         push X-* properties through, so I reverted the X-OGo-RESOURCE prop.
+         to NON-PARTICIPANT. To me it appears to conform to the specs. Also
+         the iCalSaxDriver truncates these to NON-PART - I don't know why it
+         does so. (v0.9.5)
+
 2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.4

diff --git a/SOGoLogic/SOGoAppointment.m b/SOGoLogic/SOGoAppointment.m
index 419aa0bb6d2590e8916c7ca327c0a081cf65fc01..d176dd1b34c946c1845e8d0db87b5c79871735ad 100644 (file)
--- a/SOGoLogic/SOGoAppointment.m
+++ b/SOGoLogic/SOGoAppointment.m
@@ -316,15 +316,29 @@ static SaxObjectDecoder          *sax   = nil;
 }
 
 - (NSArray *)_filteredAttendeesThinkingOfPersons:(BOOL)_persons {
-    EOQualifier *q;
-    NSString *qs;
-    
-    if(_persons)
-        qs = @"role != X-OGo-RESOURCE";
-    else
-        qs = @"role = X-OGo-RESOURCE";
-    q = [EOQualifier qualifierWithQualifierFormat:qs];
-    return [[self attendees] filteredArrayUsingQualifier:q];
+    NSArray *list;
+    NSMutableArray *filtered;
+    unsigned i, count;
+
+    list = [self attendees];
+    count = [list count];
+    filtered = [[NSMutableArray alloc] initWithCapacity:count];
+    for(i = 0; i < count; i++) {
+        iCalPerson *p;
+        NSString *role;
+
+        p = [list objectAtIndex:i];
+        role = [p role];
+        if(_persons) {
+            if(role == nil || ![role isEqualToString:@"NON-PART"])
+                [filtered addObject:p];
+        }
+        else {
+            if([role isEqualToString:@"NON-PART"])
+                [filtered addObject:p];
+        }
+    }
+    return [filtered autorelease];
 }
 
 @end

diff --git a/SOGoLogic/Version b/SOGoLogic/Version
index 749d66dc7109fb3f49932aae8e0c044ad7d4e6c0..6b227f7e3b266ef9cc7a5dc1fd384537da8702c7 100644 (file)
--- a/SOGoLogic/Version
+++ b/SOGoLogic/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=4
+SUBMINOR_VERSION:=5