From 5387d5abd7784fcd0618412faad5501ad85ef46e Mon Sep 17 00:00:00 2001
From: "spider%netscape.com"
 <spider%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 8 Oct 1998 21:16:29 +0000
Subject: [PATCH] Updates for latest raptor code

git-svn-id: svn://10.0.0.236/trunk@12314 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/calendar/modules/core/capi/local/src/capi.cpp | 10 ++++++++--
 mozilla/xpfc/shell/src/nsShellInstance.cpp            |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mozilla/calendar/modules/core/capi/local/src/capi.cpp b/mozilla/calendar/modules/core/capi/local/src/capi.cpp
index fceec1e70e2..77d64518a6e 100644
--- a/mozilla/calendar/modules/core/capi/local/src/capi.cpp
+++ b/mozilla/calendar/modules/core/capi/local/src/capi.cpp
@@ -57,13 +57,19 @@ char *CAPI_mktemp( char *psTemplate )
 {
 // XXX: Port this
 #ifdef XP_PC
-    return _mktemp(psTemplate);
+  return _mktemp(psTemplate);
+#else
+  return (nsnull);
 #endif
 }
 
 int CAPI_access( const char *path, int mode )
 {
-    return JXP_ACCESS(path,mode);
+#ifdef XP_PC
+    return _access(path,mode);
+#else
+  return (0);
+#endif
 }
 
 void *CAPI_malloc(size_t i)
diff --git a/mozilla/xpfc/shell/src/nsShellInstance.cpp b/mozilla/xpfc/shell/src/nsShellInstance.cpp
index 06da4268061..b4ff860a421 100644
--- a/mozilla/xpfc/shell/src/nsShellInstance.cpp
+++ b/mozilla/xpfc/shell/src/nsShellInstance.cpp
@@ -116,7 +116,7 @@ nsresult nsShellInstance::Init()
   mPref->Startup(nsnull);
 
 
-  res = NS_InitINetService((nsINetContainerApplication*) nsnull);
+  res = NS_InitINetService();
   if (NS_OK != res)
     return res;
 
@@ -481,7 +481,7 @@ nsEventStatus PR_CALLBACK HandleEventApplication(nsGUIEvent *aEvent)
 
       nsIMenuManager * menumgr = viewer->GetMenuManager();
 
-      nsIXPFCMenuItem * item = menumgr->MenuItemFromID(event->menuItem);
+      nsIXPFCMenuItem * item = menumgr->MenuItemFromID(event->mCommand);
 
       item->SendCommand();