minor fixes

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

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 1abf745a44d863b17e243ad1a6a636e5413ea257..8518af8f60ef4bde8bec995e16be64790726896d 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-12  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGo.m: corrected incorrect use of logging (v0.9.23)
+
 2005-02-10  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile.preamble: fixed linking on MacOSX (v0.9.22)

diff --git a/SOGo/Main/SOGo.m b/SOGo/Main/SOGo.m
index 78ed7918507cf96d3506df1e70d5a0073a35c0f8..fcbcec07077fe19893bace983bacb6f9b596dfd4 100644 (file)
--- a/SOGo/Main/SOGo.m
+++ b/SOGo/Main/SOGo.m
@@ -239,7 +239,7 @@ static BOOL doCrashOnSessionCreate = NO;
   
   if (MainProduct == Nil) {
     if ((MainProduct = NSClassFromString(@"MainUIProduct")) == Nil)
-      [self logWithFormat:@"ERROR: did not find MainUIProduct class!"];
+      [self errorWithFormat:@"did not find MainUIProduct class!"];
   }
   
   lpath = [(id)MainProduct pathToLocaleForLanguageNamed:_name];
@@ -255,7 +255,7 @@ static BOOL doCrashOnSessionCreate = NO;
   NSDictionary *locale;
   
   if (![_name isNotNull]) {
-    [self logWithFormat:@"ERROR(%s): name parameter must not be nil!",
+    [self errorWithFormat:@"%s: name parameter must not be nil!",
          __PRETTY_FUNCTION__];
     return nil;
   }
@@ -264,7 +264,7 @@ static BOOL doCrashOnSessionCreate = NO;
     return locale;
   
   if ((lpath = [self pathToLocaleForLanguageNamed:_name]) == nil) {
-    [self logWithFormat:@"ERROR: did not find Locale for language: %@", _name];
+    [self errorWithFormat:@"did not find Locale for language: %@", _name];
     return nil;
   }
   

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 9dfb272db616ff266f13aefb671fe21be4fe5cf0..b655e0337c4c93000c6a099c5992a3255a567224 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,5 +1,5 @@
 # Version file
 
-SUBMINOR_VERSION:=22
+SUBMINOR_VERSION:=23
 
 # v0.9.16 requires NGExtensions v4.5.136

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index 9833d84665f012adc327348c66c2103a89739584..419da332949da08b66bc131fe29f2b4d013f1517 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -1019,6 +1019,62 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               AD2E1FE607BD876E0012FE12 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGo.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD2E1FE707BD879D0012FE12 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoGroupPage.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD2E1FE807BD879D0012FE12 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = SOGoGroupPage.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD2E1FE907BD879D0012FE12 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoGroupsPage.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD2E1FEA07BD879D0012FE12 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = SOGoGroupsPage.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD2E1FEB07BD87B90012FE12 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = TODO;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD2E1FEC07BD87CB0012FE12 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = MainUIProduct.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                AD494C6106F5EA6600E51EC9 = {
                        fileEncoding = 4;
                        isa = PBXFileReference;
@@ -1503,6 +1559,118 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               AD770DA307AE4F7000F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoImageMailBodyPart.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DA407AE4F7000F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoMessageMailBodyPart.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DAC07AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxFilterList.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DAD07AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxFilterList.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DAE07AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxMailPartLinkViewer.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DAF07AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxMailPartLinkViewer.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DB007AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxMailPartMessageViewer.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DB107AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxMailPartMessageViewer.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DB207AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = UIxMailSizeFormatter.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DB307AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxMailSizeFormatter.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DB407AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = UIxMailTreeBlock.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DB507AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxMailTreeBlock.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DB607AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = UIxSieveEditor.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD770DB707AE4FB200F5C7A1 = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = UIxSieveEditor.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                AD7BA88A0770A62B008F4F3D = {
                        children = (
                                AD7BA88D0770A67D008F4F3D,
@@ -1794,6 +1962,15 @@
                        tabWidth = 8;
                        usesTabs = 1;
                };
+               ADCDF64107BA4EC300C74EDF = {
+                       fileEncoding = 4;
+                       indentWidth = 2;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.plist;
+                       path = cycles.plist;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                ADDF4B3006DCEAC800C4E7F8 = {
                        children = (
                                ADDF4B3C06DCEAC800C4E7F8,
@@ -2370,6 +2547,8 @@
                                ADDF4D7006DE0BAB00C4E7F8,
                                ADBE3E620727167A000FEA6A,
                                ADBE3E630727167A000FEA6A,
+                               AD770DA307AE4F7000F5C7A1,
+                               AD770DA407AE4F7000F5C7A1,
                                ADBE3E640727167A000FEA6A,
                                ADBE3E650727167A000FEA6A,
                                ADBE3E660727167A000FEA6A,
@@ -2633,6 +2812,12 @@
                };
                ADDF4DD606DE0EC100C4E7F8 = {
                        children = (
+                               AD770DB207AE4FB200F5C7A1,
+                               AD770DB307AE4FB200F5C7A1,
+                               AD770DB407AE4FB200F5C7A1,
+                               AD770DB507AE4FB200F5C7A1,
+                               AD770DB607AE4FB200F5C7A1,
+                               AD770DB707AE4FB200F5C7A1,
                                AD2C74A6071A9FF70087E027,
                                AD2C74A7071A9FF70087E027,
                                AD2C74A8071A9FF70087E027,
@@ -2669,6 +2854,12 @@
                                ADDF4DCF06DE0E9A00C4E7F8,
                                AD0A0ACC07A8093400D3B8EF,
                                AD0A0ACB07A8093400D3B8EF,
+                               AD770DAC07AE4FB200F5C7A1,
+                               AD770DAD07AE4FB200F5C7A1,
+                               AD770DAE07AE4FB200F5C7A1,
+                               AD770DAF07AE4FB200F5C7A1,
+                               AD770DB007AE4FB200F5C7A1,
+                               AD770DB107AE4FB200F5C7A1,
                        );
                        isa = PBXGroup;
                        name = Components;
@@ -2699,6 +2890,10 @@
                                E87205F00692E3D00099CBBD,
                                E87205F10692E3D00099CBBD,
                                E87205F20692E3D00099CBBD,
+                               AD2E1FE907BD879D0012FE12,
+                               AD2E1FEA07BD879D0012FE12,
+                               AD2E1FE707BD879D0012FE12,
+                               AD2E1FE807BD879D0012FE12,
                        );
                        isa = PBXGroup;
                        name = Components;
@@ -2719,6 +2914,8 @@
                        children = (
                                E87205CE0692E3D00099CBBD,
                                E87205E10692E3D00099CBBD,
+                               AD2E1FE607BD876E0012FE12,
+                               AD2E1FEC07BD87CB0012FE12,
                                E87205DF0692E3D00099CBBD,
                                E87205E00692E3D00099CBBD,
                                E87205ED0692E3D00099CBBD,
@@ -3084,6 +3281,7 @@
                E872058F0692E3D00099CBBD = {
                        children = (
                                E87205D80692E3D00099CBBD,
+                               AD2E1FEB07BD87B90012FE12,
                                AD152B6F06AC159A002375D2,
                                E87205F30692E3D00099CBBD,
                                E87205D70692E3D00099CBBD,
@@ -3910,6 +4108,7 @@
                                E872088E0692E3D30099CBBD,
                                E87208E20692E3D30099CBBD,
                                ADCDE53206ADA8C800BFCE2B,
+                               ADCDF64107BA4EC300C74EDF,
                                E8720A0C0692E4940099CBBD,
                                E87208960692E3D30099CBBD,
                                E8720A3B0692E4C20099CBBD,