git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1227 d1b88da0-ebda-0310...

diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 801f22856203e2d2492d46643f308a9c395fa3af..549ad5a29bf580b9680636f83dcd4bd6e8637d5a 100644 (file)
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * iCalDateHolder.m ([iCalDateHolder -awakeAfterUsingSaxDecoder:]):
+       make use of cStringUsingEncoding: instead of getString:length: to
+       retrieve the buffer content to work-around a bug in gnustep-base.
+
 2007-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * CardGroup.m ([CardGroup +parseFromSource:source]): make sure the

diff --git a/SOPE/NGCards/iCalDateHolder.m b/SOPE/NGCards/iCalDateHolder.m
index c6e73890a95d2b9beac6653fd385fea2a0b75fee..7115447c84c1759627a2c03b67df075e4bbf1805 100644 (file)
--- a/SOPE/NGCards/iCalDateHolder.m
+++ b/SOPE/NGCards/iCalDateHolder.m
@@ -130,14 +130,17 @@ static NSTimeZone *gmt = nil;
   if ([s rangeOfString:@"T"].length == 0 && [s length] == 8) {
     /* hm, maybe a date without a time? like an allday event! */
     int year, month, day;
-    char buf[16];
-    [s getCString:&(buf[0])];
-    
-    buf[9] = '\0';
-    day    = atoi(&(buf[6]));  buf[6] = '\0';
-    month  = atoi(&(buf[4]));  buf[4] = '\0';
-    year   = atoi(&(buf[0]));
+    char *buf;
+
+    buf = strdup([s cStringUsingEncoding: NSASCIIStringEncoding]);
     
+    day    = atoi(buf + 6);
+    buf[6] = '\0';
+    month  = atoi(buf + 4);
+    buf[4] = '\0';
+    year   = atoi(buf);
+    free (buf);
+
     date = [NSCalendarDate dateWithYear:year month:month day:day
                            hour:0 minute:0 second:0
                            timeZone:tz];

diff --git a/SOPE/sope-patchset-r1546.diff b/SOPE/sope-patchset-r1546.diff
index 92700bcd97327c1e15e2019f1c7fdb235f52dc83..c2dffc9af8bcaa30a5e1aeac5f97163e56a511fa 100644 (file)
--- a/SOPE/sope-patchset-r1546.diff
+++ b/SOPE/sope-patchset-r1546.diff
@@ -257,7 +257,7 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
 -  
 +
 +  length = [_data length];
-+  bytes = [_data cString];
++  bytes = [_data cStringUsingEncoding: NSASCIIStringEncoding];
 +
    /* remove leading chars (skip to first digit, the day of the month) */
    while (length > 0 && (!isdigit(*bytes))) {
@@ -458,10 +458,45 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
      }
  
    OCIHandleFree(_current_stm, OCI_HTYPE_STMT);
-@@ -138,6 +141,14 @@
-       {
-         NSLog(@"FAILED: OCITerminate()");
+@@ -75,6 +78,30 @@
+ //
+ @implementation OracleAdaptorChannel
+ 
++static void
++DBTerminate()
++{
++  if (OCITerminate(OCI_DEFAULT))
++    NSLog(@"FAILED: OCITerminate()");
++  else
++    NSLog(@"Oracle8: environment shut down");
++}
++
+++ (void) initialize
++{
++  // We Initialize the OCI process environment.
++  if (OCIInitialize((ub4)OCI_DEFAULT, (dvoid *)0,
++                    (dvoid * (*)(dvoid *, size_t)) 0,
++                    (dvoid * (*)(dvoid *, dvoid *, size_t))0,
++                    (void (*)(dvoid *, dvoid *)) 0 ))
++    NSLog(@"FAILED: OCIInitialize()");
++  else
++    {
++      NSLog(@"Oracle8: environment initialized");
++      atexit(DBTerminate);
++    }
++}
++
+ - (id) initWithAdaptorContext: (EOAdaptorContext *) theAdaptorContext
+ {
+   if ((self = [super initWithAdaptorContext: theAdaptorContext]))
+@@ -134,10 +161,14 @@
+         NSLog(@"FAILED: OCILogoff()");
        }
+ 
+-      if (OCITerminate(OCI_DEFAULT))
+-      {
+-        NSLog(@"FAILED: OCITerminate()");
+-      }
 +
 +      OCIHandleFree(_oci_ctx, OCI_HTYPE_SVCCTX);
 +      OCIHandleFree(_oci_err, OCI_HTYPE_ERROR);
@@ -473,7 +508,7 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
      }
  }
  
-@@ -151,11 +162,6 @@
+@@ -151,11 +182,6 @@
    [self _cleanup];
  
    RELEASE(_resultSetProperties);
@@ -485,6 +520,22 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
    RELEASE(delegate);
  
    [super dealloc];
+@@ -368,15 +394,6 @@
+       return NO;
+     }
+ 
+-  // We Initialize the OCI process environment.
+-  if (OCIInitialize((ub4)OCI_DEFAULT, (dvoid *)0,
+-                    (dvoid * (*)(dvoid *, size_t)) 0,
+-                    (dvoid * (*)(dvoid *, dvoid *, size_t))0,
+-                    (void (*)(dvoid *, dvoid *)) 0 ))
+-    {
+-      NSLog(@"FAILED: OCIInitialize()");
+-      return NO;
+-    }
+   
+   if (OCIEnvInit((OCIEnv **)&_oci_env, (ub4)OCI_DEFAULT, (size_t)0, (dvoid **)0))
+     {
 Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
 ===================================================================
 --- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1546)

diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 2356d37b5ae75f32dc484ab39660387af4b02b2a..669cb7fcd7cf9630900f7a13005bbee9e09abecb 100644 (file)
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -148,6 +148,14 @@
     </ul>
   </div>
 
+  <div class="menu" id="addressMenu">
+    <ul>
+      <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
+      <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
+      <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
+    </ul>
+  </div>
+
   <div id="leftPanel">
     <div class="titlediv"><var:string label:value="Folders" /></div>
     <div id="folderTreeContent"><!-- space --></div>

diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox
index 2f7f01b4d05f2d92c947819248f843888f9e3c46..d5c07e64879e98151b596a79e8aa44697de957cf 100644 (file)
--- a/UI/Templates/MailerUI/UIxMailPopupView.wox
+++ b/UI/Templates/MailerUI/UIxMailPopupView.wox
@@ -10,4 +10,11 @@
     <span id="messageContent">
       <var:component className="UIxMailView" />
     </span>
+    <div class="menu" id="addressMenu">
+      <ul>
+        <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
+        <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
+        <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
+      </ul>
+    </div>
    </var:component>

diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index 68d3e7434a1676369ecf96f4368b0ab2002ecc11..74f5637831cef4d72c928d9393659d6154f387c3 100644 (file)
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -74,11 +74,4 @@
         bodyInfo="clientObject.bodyStructure" />
     </div>
 
-    <div class="menu" id="addressMenu">
-      <ul>
-        <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
-        <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
-        <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
-      </ul>
-    </div>
   </container>

diff --git a/UI/WebServerResources/UIxAppointmentEditor.css b/UI/WebServerResources/UIxAppointmentEditor.css
index 1528f4688c41e3f459af933713ebb96130524690..3bef0501006de58d5f601619c6a4d847daab23bf 100644 (file)
--- a/UI/WebServerResources/UIxAppointmentEditor.css
+++ b/UI/WebServerResources/UIxAppointmentEditor.css
@@ -44,6 +44,7 @@ DIV.contactSelector
 LABEL, SPAN.checkBoxList
 { display: block;
   position: relative;
+  line-height: 1.5em;
   height: 1.5em;
   margin-left: .5em;
   margin-bottom: .5em;
@@ -76,6 +77,9 @@ SPAN.content
   left: 8em;
   right: 1em; }
 
+SPAN.content A
+{ line-height: 2em; }
+
 TEXTAREA
 { position: absolute;
   top: 0px;

diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css
index 054a9515033fe513169b5efbc6c72f6a557559db..67156317a60d2beaf820dd5b90b11c1626e1235e 100644 (file)
--- a/UI/WebServerResources/UIxAttendeesEditor.css
+++ b/UI/WebServerResources/UIxAttendeesEditor.css
@@ -9,9 +9,12 @@ DIV#attendeesView
   border: 0px; }
 
 DIV#freeBusyView
-{ position: static;
-  margin-top: 2em;
-  margin-left: 12.5em;
+{ background-color: #fff;
+  position: absolute;
+  margin-top: 0.5em;
+  top: 2em;
+  bottom: 14.5em;
+  left: 13em;
   overflow: auto;
   border-top: 2px solid #222;
   border-left: 2px solid #222;
@@ -35,25 +38,25 @@ TABLE#freeBusy TH
 
 TABLE#freeBusy TH.attendees,
 TABLE#freeBusy TD.attendees
-{ /*position: absolute;*/
-  position: fixed;
+{ position: fixed;
   padding: 0px .5em;
+  padding-right: 0px;
   margin: 0px;
-  width: 11em;
+  width: 13em;
   border: 0px !important;
-  background: #d4d0c8 !important;
+  background-color: #d4d0c8;
   overflow: hidden;
   left: 0px; }
 
 TABLE#freeBusy TD.attendees IMG
 { position: absolute;
   left: 0em;
-  top: .5em; }
+  top: 0.5em; }
 
 TABLE#freeBusy TD.attendees INPUT
-{ width: 10em;
+{ width: 11.5em;
   margin: 0px;
-  margin-left: 10px; }
+  margin-left: 5px; }
 
 TABLE#freeBusy TR.freeBusyHeader2 TH
 { font-weight: normal; }

diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index 2ed30effb044479ddbb33e16d89d8cbd08470683..bf46f21a106b328e36331a4aae6b96fba66ed70f 100644 (file)
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -21,9 +21,10 @@ DIV.addressList
 { margin: 5px; }
 
 TABLE#addressList
-{ border: 1px solid #333;
-  border-bottom: 1px solid #aaa;
-  border-right: 1px solid #ccc;
+{ border-bottom: 1px solid #fff;
+  border-right: 1px solid #fff;
+  border-top: 1px solid #444;
+  border-left: 1px solid #444;
   border-spacing: 0px;
   margin: 0px;
   padding: 0px;

diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 38dc140c07fc77f40b9da55def426e9c5e4b3b66..ff0757e13726e3ece076e24573840025785d8034 100644 (file)
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -31,3 +31,31 @@ DIV.shadow3.css,
 
 DIV.shadow4.css
 { filter: alpha(opacity=40); }
+
+/* UIxAppointmentEditor */
+
+SPAN.content A
+{ line-height: 2.5em; }
+
+SPAN.content > INPUT.textField
+{ width: 99%; }
+
+/* UIxAttendeesEditor */
+
+DIV#freeBusyView
+{ border-bottom: 1px solid #fff;
+  border-right: 1px solid #fff;
+  border-top: 2px solid #222;
+  border-left: 2px solid #222;
+  left: 0.5em;
+  margin-left: 0.5em; }
+
+TABLE#freeBusy TH.attendees,
+TABLE#freeBusy TD.attendees
+{ background-color: #fff !important;
+  padding-right: 5px;
+  padding-left: 0px; }
+
+TABLE#freeBusy TD.attendees INPUT
+{ border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc; }
\ No newline at end of file