No more netcaster. Minor 4.5 merges (added referrer to DoGetURL).

cmd/macfe/central/uapp.cp

@@ -934,7 +934,6 @@ CFrontApp::CFrontApp()
 	// whether conference launches on startup or not (but that occurence of
 	// FindApplication isn't called many times/sec either).
 	mConferenceApplicationExists = (CFileMgr::FindApplication(kConferenceAppSig, spec) == noErr);
-	mNetcasterContext = NULL;
 }
 
 //-----------------------------------
@@ -2963,7 +2962,7 @@ void CFrontApp::DoWindowsMenu(CommandT inCommand)
 
 // DoGetURL loads the given url into the frontmost window, or new one if there is no frontmost
 // Provides a bottleneck for UI generated requests to load a URL
-void CFrontApp::DoGetURL( const cstring & url, const char* inTarget )
+void CFrontApp::DoGetURL( const cstring & url, const char* inReferrer, const char* inTarget )
 {
 	// Check for kiosk mode and bail if it's set so that the user can't manually
 	// go to a different URL.  Note that this does NOT prevent dispatching to a different
@@ -2977,9 +2976,13 @@ void CFrontApp::DoGetURL( const cstring & url, const char* inTarget )
 		// URDFUtilities::LaunchNode(). Both are quick. (pinkerton)
 		if ( !URDFUtilities::LaunchURL(url) ) {
 			URL_Struct* theURL = NET_CreateURLStruct(url, NET_DONT_RELOAD);
-			theURL->window_target = const_cast<char*>(inTarget);
+			if (theURL) {
-			if (theURL)
+				if ( inTarget )
+					theURL->window_target = strdup(inTarget);
+				if ( inReferrer )
+					theURL->referer = strdup(inReferrer);		
 				CURLDispatcher::DispatchURL(theURL, NULL);
+			}
 		}
 	}
 }
@@ -4289,6 +4292,8 @@ void CFrontApp::LaunchExternalApp(OSType inAppSig, ResIDT inAppNameStringResourc
 	}
 }
 
+#if MOZ_3270_APPLET
+
 // Tries to find local file 3270/HE3270EN.HTM
 Boolean CFrontApp::Find3270Applet(FSSpec& tn3270File)
 {
@@ -4328,6 +4333,7 @@ void CFrontApp::Launch3270Applet()
 		ErrorManager::PlainAlert(ERROR_LAUNCH_IBM3270);
 	}
 }
+#endif /* MOZ_3270_APPLET */
 
 FSSpec CFrontApp::CreateAccountSetupSpec()
 {
@@ -4396,6 +4402,7 @@ Boolean CFrontApp::LaunchAccountSetup()
 	return FALSE; 
 }
 
+#if 0
 static void launchNetcasterCallback(void* closure);
 
 static void launchNetcasterCallback(void* /*closure*/)
@@ -4431,6 +4438,7 @@ void CFrontApp::SetNetcasterContext(MWContext *context)
 {
 	mNetcasterContext = context;	
 }
+#endif
 
 // 97-08-23 pchen -- This method should be called when we're "low on memory."
 // For now, we just call LJ_ShutdownJava().
@@ -4445,6 +4453,7 @@ void CFrontApp::MemoryIsLow()
 #endif /* defined (JAVA) */
 }
 
+
 #pragma mark -
 
 //======================================

cmd/macfe/central/uapp.h

@@ -102,8 +102,8 @@ public:
 	virtual void		EventKeyDown( const EventRecord& inMacEvent );
 	
 	// so plug-ins can get key ups (which are ignored by default)
-	virtual void		ProcessNextEvent();
 	virtual void		EventKeyUp(const EventRecord &inMacEvent);
+	virtual void		ProcessNextEvent();
 
 	Boolean				HasProperlyStartedUp() const { return fProperStartup; }
 	
@@ -156,7 +156,7 @@ public:
 	static void			DoHelpMenuItem( short itemNum );
 
 	// ¥¥ Command handling
-	static void 		DoGetURL (const cstring& url, const char* inTarget = NULL);
+	static void 		DoGetURL (const cstring& url, const char* inReferrer=NULL, const char* inTarget = NULL);
 							// loads the given url into the frontmost window, or new one if there
 							// is no frontmost
 	static void			DoOpenDirectoryURL( CommandT menuCommand );
@@ -211,10 +211,12 @@ public:
 
 	static CMailNewsWindow*	GetMailNewsWindow();
 
+#if 0
 	// EA - Netcaster support
 	void				LaunchNetcaster(void);
 	MWContext*			GetNetcasterContext(void);	
 	void				SetNetcasterContext(MWContext *);
+#endif
 	
 	// 97-05-12 pkc -- dpi support for MWContext
 	static double		sHRes;
@@ -255,8 +257,11 @@ protected:
 							int currItem, LWindow * win, short iconID=0); // Utility function to add an item into windows menu
 
 	void				LaunchExternalApp(OSType inAppSig, ResIDT inAppNameStringResourceID);
+
+#ifdef IBM_HOST_ON_DEMAND
 	Boolean				Find3270Applet(FSSpec& tn3270File);
 	void				Launch3270Applet();
+#endif
 
 	Boolean				LaunchAccountSetup();
 	
@@ -291,8 +296,6 @@ public:
 
 protected:
 	FSSpec				CreateAccountSetupSpec();
-	
-	MWContext*			mNetcasterContext;	// EA - Track the Netcaster window
 	RgnHandle				mMouseRgnH;
 };