From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 26 Jan 2005 17:38:33 +0000 (+0000)
Subject: Fixed SOGo Bug #1053
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb4775ef38cc890456974707fb0e845f4982fad2;p=scalable-opengroupware.org

Fixed SOGo Bug #1053

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

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index a878a678..9833d846 100644
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -613,6 +613,22 @@
 			sourceTree = "<group>";
 			tabWidth = 8;
 		};
+		AD0A0ACB07A8093400D3B8EF = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text.xml;
+			path = UIxMailWindowCloser.wox;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AD0A0ACC07A8093400D3B8EF = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
+			path = UIxMailWindowCloser.m;
+			refType = 4;
+			sourceTree = "<group>";
+		};
 		AD152B6F06AC159A002375D2 = {
 			fileEncoding = 4;
 			indentWidth = 8;
@@ -2651,6 +2667,8 @@
 				ADC07230072E9BFB00C125E0,
 				ADDF4DCE06DE0E9A00C4E7F8,
 				ADDF4DCF06DE0E9A00C4E7F8,
+				AD0A0ACC07A8093400D3B8EF,
+				AD0A0ACB07A8093400D3B8EF,
 			);
 			isa = PBXGroup;
 			name = Components;
diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 891da1bc..f6fce35a 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,4 +1,14 @@
-2004-01-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+2005-01-26  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+        * UIxMailWindowCloser.{m,wox}: new component which closes the window
+          in its "onLoad".
+
+        * UIxMailEditor.m: close window after successful send by opening
+          UIxMailWindowCloser. This fixes SOGo Bug #1053.
+
+        * v0.9.72
+
+2005-01-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* {English/French}.lproj/default.strings: changed encoding from
 	  ISO-Latin-1 to UTF-8, which is now the default (v0.9.71)
diff --git a/SOGo/UI/Mailer/GNUmakefile b/SOGo/UI/Mailer/GNUmakefile
index 0fd99b73..bf97210d 100644
--- a/SOGo/UI/Mailer/GNUmakefile
+++ b/SOGo/UI/Mailer/GNUmakefile
@@ -34,6 +34,7 @@ MailerUI_OBJC_FILES += \
 	UIxMailEditorAction.m		\
 	UIxMailToSelection.m		\
 	UIxMailAddressbook.m		\
+	UIxMailWindowCloser.m		\
 	\
 	UIxMailPartViewer.m		\
 	UIxMailPartTextViewer.m		\
@@ -64,6 +65,7 @@ MailerUI_RESOURCE_FILES += \
 	UIxMailEditorAttach.wox		\
 	UIxMailToSelection.wox		\
 	UIxMailAddressbook.wox		\
+	UIxMailWindowCloser.wox		\
 	\
 	UIxMailPartTextViewer.wox	\
 	UIxMailPartMixedViewer.wox	\
diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/Mailer/UIxMailEditor.m
index 9f3af7b2..20e565c3 100644
--- a/SOGo/UI/Mailer/UIxMailEditor.m
+++ b/SOGo/UI/Mailer/UIxMailEditor.m
@@ -237,9 +237,7 @@ static NSArray *infoKeys = nil;
     return error;
   
   // if everything is ok, close the window (send a JS closing the Window)
-#warning TODO: send window close JavaScript
-  [self logWithFormat:@"TODO: should close the send window"];
-  return self;
+  return [self pageWithName:@"UIxMailWindowCloser"];
 }
 
 - (id)deleteAction {
diff --git a/SOGo/UI/Mailer/UIxMailWindowCloser.m b/SOGo/UI/Mailer/UIxMailWindowCloser.m
new file mode 100644
index 00000000..b7954de5
--- /dev/null
+++ b/SOGo/UI/Mailer/UIxMailWindowCloser.m
@@ -0,0 +1,36 @@
+/*
+  Copyright (C) 2000-2004 SKYRIX Software AG
+
+  This file is part of OGo
+
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+// $Id$
+
+#include <NGObjWeb/NGObjWeb.h>
+
+@interface UIxMailWindowCloser : WOComponent
+{
+
+}
+
+@end
+
+#include "common.h"
+
+@implementation UIxMailWindowCloser
+
+@end
diff --git a/SOGo/UI/Mailer/UIxMailWindowCloser.wox b/SOGo/UI/Mailer/UIxMailWindowCloser.wox
new file mode 100644
index 00000000..e21397c7
--- /dev/null
+++ b/SOGo/UI/Mailer/UIxMailWindowCloser.wox
@@ -0,0 +1,19 @@
+<?xml version='1.0' standalone='yes'?>
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:var="http://www.skyrix.com/od/binding"
+      xmlns:const="http://www.skyrix.com/od/constant"
+      xmlns:rsrc="OGo:url"
+      xmlns:label="OGo:label"
+>
+  <head>
+    <title><var:string label:value="OpenGroupware.org"/></title>
+    <meta name="description" content="SOGo Web Interface"/>
+    <meta name="author" content="SKYRIX Software AG"/>
+    <meta name="robots" content="stop"/>
+    <link href="mailto:info@skyrix.com" rev="made"/>
+  </head>
+
+  <body onload="window.close()">
+  </body>
+</html>
\ No newline at end of file
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 806bdfcb..d27cb563 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=71
+SUBMINOR_VERSION:=72
 
 # v0.9.70 requires NGExtensions v4.5.136
 # v0.9.69 requires libNGMime    v4.5.203