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

diff --git a/SOPE/sope-gdl1/GDLContentStore/ChangeLog b/SOPE/sope-gdl1/GDLContentStore/ChangeLog
index bdd4c43b7877c3559306eacb8e3f313d9ee0ec17..888196051742e9cfd4b115acfb11c597013547e4 100644 (file)
--- a/SOPE/sope-gdl1/GDLContentStore/ChangeLog
+++ b/SOPE/sope-gdl1/GDLContentStore/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * GCSFolderManager.m ([GCSFolderManager -baseTableNameWithUID:]):
+       cast the time interval to an unsigned int.
+
 2007-08-29  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
 
        * EOQualifier+GCS.m: rewrote comparison code, now uses UPPER instead of

diff --git a/SOPE/sope-gdl1/GDLContentStore/GCSFolderManager.m b/SOPE/sope-gdl1/GDLContentStore/GCSFolderManager.m
index 3526fd16bd58e9c4e6eb1dc4be336edae820de22..bee84b5d11a64bc5d7dc92910fa91aa88bd3bc9d 100644 (file)
--- a/SOPE/sope-gdl1/GDLContentStore/GCSFolderManager.m
+++ b/SOPE/sope-gdl1/GDLContentStore/GCSFolderManager.m
@@ -642,7 +642,7 @@ static NSCharacterSet *asciiAlphaNumericCS  = nil;
     }
 
   return [NSString stringWithFormat: @"%@%u",
-                  newUID, [now timeIntervalSince1970]];
+                  newUID, (unsigned int) [now timeIntervalSince1970]];
 }
 
 - (NSException *)createFolderOfType:(NSString *)_type

diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index c2971d66ba4fd88668e5e368d2b0dde0591dd95f..4522d2d085e70debf7e62ffbd9092b32ce42c742 100644 (file)
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -781,7 +781,7 @@ function popupSubmenu(event) {
     if (window.height()
        < (menuTop + submenuNode.offsetHeight)
        && submenuNode.offsetHeight < window.height())
-      menuTop = this.offsetTop - submenuNode.offsetHeight + 1;
+      menuTop -= submenuNode.offsetHeight - this.offsetHeight - 4;
     var menuLeft = (parentNode.offsetLeft + parentNode.offsetWidth - 3);
     if (window.width()
        < (menuLeft + submenuNode.offsetWidth))