From 8c729f6eb8042946bfa4eaed1a0cf929e7921eeb Mon Sep 17 00:00:00 2001 From: dwetzel Date: Wed, 16 Oct 2002 15:38:34 +0000 Subject: [PATCH] applied patch from David Ayers git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@14791 72102866-910b-0410-8b05-ffd578937521 --- GSWeb.framework/GSWApplication.m | 8 ++++++++ GSWeb.framework/GSWWOCompatibility.h | 2 ++ GSWeb.framework/GSWWOCompatibility.m | 2 ++ GSWeb.framework/GSWeb.h | 1 + 4 files changed, 13 insertions(+) diff --git a/GSWeb.framework/GSWApplication.m b/GSWeb.framework/GSWApplication.m index 051f634..fc6b24d 100644 --- a/GSWeb.framework/GSWApplication.m +++ b/GSWeb.framework/GSWApplication.m @@ -626,7 +626,12 @@ int GSWApplicationMain(NSString* applicationClassName, DESTROY(_activeSessionsCountLock); if (GSWApp == self) + { GSWApp = nil; +#if !GSWEB_WONAMES + WOApp = nil; +#endif + } GSWLogMemC("Dealloc GSWApplication Super"); [super dealloc]; @@ -2975,6 +2980,9 @@ selfLockn, [application class], [application name]); GSWApp=application; +#if !GSWEB_WONAMES + WOApp=application; +#endif }; @end diff --git a/GSWeb.framework/GSWWOCompatibility.h b/GSWeb.framework/GSWWOCompatibility.h index 66f74d5..36e5a50 100644 --- a/GSWeb.framework/GSWWOCompatibility.h +++ b/GSWeb.framework/GSWWOCompatibility.h @@ -257,6 +257,8 @@ @interface WOHyperlink : GSWHyperlink @end +extern WOApplication *WOApp; + #endif #endif // _GSWWOCompatibility_h__ diff --git a/GSWeb.framework/GSWWOCompatibility.m b/GSWeb.framework/GSWWOCompatibility.m index 48cdd75..af89f11 100644 --- a/GSWeb.framework/GSWWOCompatibility.m +++ b/GSWeb.framework/GSWWOCompatibility.m @@ -256,6 +256,8 @@ static char rcsId[] = "$Id$"; @implementation WOHyperlink @end +WOApplication *WOApp=nil; + #endif diff --git a/GSWeb.framework/GSWeb.h b/GSWeb.framework/GSWeb.h index 590007c..e4e9a30 100644 --- a/GSWeb.framework/GSWeb.h +++ b/GSWeb.framework/GSWeb.h @@ -76,6 +76,7 @@ #if GSWEB_WONAMES #define GSWAdaptor WOAdaptor +#define GSWDefaultAdaptor WODefaultAdaptor #define GSWApplication WOApplication #define GSWAssociation WOAssociation #define GSWComponent WOComponent