Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 76405

Browse Source 
a=edburns
author = edburns ashuk
r=edburns

Files in fix for this bug:

M dom/classes/Makefile
M webclient/src_moz/CBrowserContainer.cpp
M webclient/src_moz/CBrowserContainer.h
M webclient/src_moz/CurrentPageActionEvents.cpp
M webclient/src_moz/HistoryActionEvents.cpp
M webclient/src_moz/Makefile.in
M webclient/src_moz/NativeEventThread.cpp
M webclient/src_moz/motif/MotifBrowserControlCanvas.cpp

This checkin makes Webclient work with the Mozilla trunk as of 27 April
0100 PDT.


git-svn-id: svn://10.0.0.236/trunk@93341 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2001-04-28 00:53:21 +00:00
parent 91149e1677
commit bc1b833426
8 changed files with 131 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/java/webclient/src_moz/NativeEventThread.cpp
View File

@@ -55,7 +55,6 @@
#include "nsRepository.h"
#include "nsIServiceManager.h" // for do_GetService
#include "nsISHistory.h" // for sHistory
#include "nsIPref.h" // for preferences
#include "nsIThread.h" // for PRThread
#include "nsIDocShell.h"
#include "nsIBaseWindow.h"
@@ -86,8 +85,6 @@ static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID);
static NS_DEFINE_IID(kISHistoryIID, NS_ISHISTORY_IID);
static NS_DEFINE_CID(kSHistoryCID, NS_SHISTORY_CID);
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
static const char *NS_DOCSHELL_PROGID = "component://netscape/docshell/html";
@@ -634,15 +631,7 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
}
}
// Setup Prefs obj and read default prefs
if (gFirstTime) {
nsCOMPtr<nsIPref> mPrefs(do_GetService(kPrefCID));
if (!mPrefs) {
initContext->initFailCode = kCreateWebShellError;
return NS_ERROR_UNEXPECTED;
}
rv = mPrefs->StartUp();
rv = mPrefs->ReadUserPrefs();
gFirstTime = PR_FALSE;
}
PRBool allowPlugins = PR_TRUE;