Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed2006-12-07 14:08:00 -0500
committerGrant Gayed2006-12-07 14:08:00 -0500
commit422cef912ebcccb722e5edb2d6001d6e9c36a984 (patch)
treee8334de76a4991632d39db00c7e793b10bb22b37
parentec032417f1761914f95f08f6ed78bd9aee9ac40c (diff)
downloadeclipse.platform.swt-422cef912ebcccb722e5edb2d6001d6e9c36a984.tar.gz
eclipse.platform.swt-422cef912ebcccb722e5edb2d6001d6e9c36a984.tar.xz
eclipse.platform.swt-422cef912ebcccb722e5edb2d6001d6e9c36a984.zip
161310
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java2
6 files changed, 14 insertions, 13 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
index 721c7ff0db..e46b72af10 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
@@ -24,9 +24,10 @@ XPCOM_NS_GetComponentManager_0=cast=(nsIComponentManager**)
XPCOM_NS_GetServiceManager=
XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**)
-XPCOM_NS_InitEmbedding=
-XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *)
-XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM2=
+XPCOM_NS_InitXPCOM2_0=cast=(nsIServiceManager **)
+XPCOM_NS_InitXPCOM2_1=cast=(nsILocalFile *)
+XPCOM_NS_InitXPCOM2_2=cast=(nsIDirectoryServiceProvider *)
XPCOM_NS_NewLocalFile=
XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
index c129685253..a30b2c1a6e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
@@ -68,14 +68,14 @@ fail:
}
#endif
-#ifndef NO_NS_1InitEmbedding
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitEmbedding)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+#ifndef NO_NS_1InitXPCOM2
+JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1InitEmbedding_FUNC);
- rc = (jint)NS_InitEmbedding((nsILocalFile *)arg0, (nsIDirectoryServiceProvider *)arg1);
- XPCOM_NATIVE_EXIT(env, that, NS_1InitEmbedding_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, NS_1InitXPCOM2_FUNC);
+ rc = (jint)NS_InitXPCOM2((nsIServiceManager **)arg0, (nsILocalFile *)arg1, (nsIDirectoryServiceProvider *)arg2);
+ XPCOM_NATIVE_EXIT(env, that, NS_1InitXPCOM2_FUNC);
return rc;
}
#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
index 6d00ee7baf..683a21fcd8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
@@ -20,7 +20,7 @@ char * XPCOM_nativeFunctionNames[] = {
"Call",
"NS_1GetComponentManager",
"NS_1GetServiceManager",
- "NS_1InitEmbedding",
+ "NS_1InitXPCOM2",
"NS_1NewLocalFile",
"NS_1TermEmbedding",
"PR_1Free",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
index 4cb5c445d5..9e526a9f43 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
@@ -24,7 +24,7 @@ typedef enum {
Call_FUNC,
NS_1GetComponentManager_FUNC,
NS_1GetServiceManager_FUNC,
- NS_1InitEmbedding_FUNC,
+ NS_1InitXPCOM2_FUNC,
NS_1NewLocalFile_FUNC,
NS_1TermEmbedding_FUNC,
PR_1Free_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
index 4b29163dc5..8e48ab2c67 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
@@ -112,7 +112,7 @@ public static final native void memmove(int /*long*/ dest, char[] src, int nbyte
public static final native void memmove(byte[] dest, char[] src, int nbytes);
public static final native int NS_GetComponentManager(int /*long*/[] result);
public static final native int NS_GetServiceManager(int /*long*/[] result);
-public static final native int NS_InitEmbedding(int /*long*/ aMozBinDirectory, int /*long*/ aAppFileLocProvider);
+public static final native int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
public static final native int NS_NewLocalFile(int /*long*/ path, boolean followLinks, int /*long*/[] result);
public static final native int NS_TermEmbedding();
public static final native int strlen_PRUnichar(int /*long*/ s);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java
index bd2a6a8fce..679d6a4f70 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java
@@ -196,7 +196,7 @@ public Browser(Composite parent, int style) {
}
nsILocalFile localFile = new nsILocalFile(retVal[0]);
- rc = XPCOM.NS_InitEmbedding(localFile.getAddress(), 0);
+ rc = XPCOM.NS_InitXPCOM2(0, localFile.getAddress(), 0);
localFile.Release();
if (rc != XPCOM.NS_OK) {
dispose();

Back to the top