M Makefile.win
M dom/jni/javaDOMEventsGlobals.cpp M dom/jni/makefile.win M dom/jni/nativeDOMProxyListener.cpp M dom/jni/nativeDOMProxyListener.h M dom/jni/org_mozilla_dom_events_EventImpl.cpp M dom/src/makefile.win M dom/src/nsJavaDOMImpl.cpp M webclient/Makefile.win M webclient/classes_spec/Makefile.win M webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java M webclient/src_moz/CBrowserContainer.cpp M webclient/src_moz/CurrentPageActionEvents.cpp M webclient/src_moz/HistoryActionEvents.cpp M webclient/src_moz/HistoryImpl.cpp M webclient/src_moz/InputStreamShim.cpp M webclient/src_moz/Makefile.win M webclient/src_moz/NativeEventThread.cpp M webclient/src_moz/NativeEventThreadActionEvents.cpp M webclient/src_moz/NavigationActionEvents.cpp M webclient/src_moz/NavigationImpl.cpp M webclient/src_moz/PreferencesActionEvents.cpp M webclient/src_moz/PromptActionEvents.cpp M webclient/src_moz/RDFActionEvents.cpp M webclient/src_moz/win32/Makefile.win Changes to make webclient compile and run with MOZILLA_0_9_9_BRANCH. git-svn-id: svn://10.0.0.236/trunk@118989 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -33,6 +33,9 @@
|
||||
|
||||
#include "HistoryActionEvents.h"
|
||||
#include "ns_util.h"
|
||||
#include "nsIHistoryEntry.h"
|
||||
#include "nsIURI.h"
|
||||
#include "nsString.h"
|
||||
|
||||
/*
|
||||
* wsCanBackEvent
|
||||
@@ -254,7 +257,7 @@ wsGetURLForIndexEvent::handleEvent ()
|
||||
nsresult rv;
|
||||
nsISHistory* sHistory;
|
||||
rv = mInitContext->webNavigation->GetSessionHistory(&sHistory);
|
||||
char *indexURL = nsnull;
|
||||
const char *indexURL = nsnull;
|
||||
|
||||
nsIHistoryEntry * Entry;
|
||||
rv = sHistory->GetEntryAtIndex(mHistoryIndex, PR_FALSE, &Entry);
|
||||
@@ -268,12 +271,15 @@ wsGetURLForIndexEvent::handleEvent ()
|
||||
if (NS_FAILED(rv)) {
|
||||
return result;
|
||||
}
|
||||
|
||||
rv = URI->GetSpec(&indexURL);
|
||||
|
||||
nsCString urlSpecString;
|
||||
|
||||
rv = URI->GetSpec(urlSpecString);
|
||||
if (NS_FAILED(rv)) {
|
||||
return result;
|
||||
}
|
||||
|
||||
indexURL = urlSpecString.get();
|
||||
result = (void *) indexURL;
|
||||
}
|
||||
return result;
|
||||
|
||||
Reference in New Issue
Block a user