Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed2011-12-19 12:36:54 -0500
committerGrant Gayed2011-12-19 12:36:54 -0500
commit26be09443b897a26367a8fdb94731233459466cc (patch)
treef53141880fe500e2f5451800b933cf9d1d97e55f
parent41caf8ecbefc5bf7f7687f4caf81b4a45d00e72b (diff)
downloadeclipse.platform.swt-26be09443b897a26367a8fdb94731233459466cc.tar.gz
eclipse.platform.swt-26be09443b897a26367a8fdb94731233459466cc.tar.xz
eclipse.platform.swt-26be09443b897a26367a8fdb94731233459466cc.zip
adjust previous fix to 3.7.2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java24
5 files changed, 15 insertions, 27 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
index 00bef3dce5..daa6b59362 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
@@ -481,16 +481,6 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name)
}
#endif
-#ifndef NO__1soup_1cookie_1free
-JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1free)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1free_FUNC);
- soup_cookie_free((SoupCookie *)arg0);
- WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1free_FUNC);
-}
-#endif
-
#ifndef NO__1soup_1cookie_1jar_1add_1cookie
JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie)
(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
index 15305a44c7..fb904897b9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c
@@ -18,8 +18,8 @@
#ifdef NATIVE_STATS
-int WebKitGTK_nativeFunctionCount = 98;
-int WebKitGTK_nativeFunctionCallCount[98];
+int WebKitGTK_nativeFunctionCount = 97;
+int WebKitGTK_nativeFunctionCallCount[97];
char * WebKitGTK_nativeFunctionNames[] = {
"JSClassDefinition_1sizeof",
"_1JSClassCreate",
@@ -56,7 +56,6 @@ char * WebKitGTK_nativeFunctionNames[] = {
"_1soup_1auth_1authenticate",
"_1soup_1auth_1get_1host",
"_1soup_1auth_1get_1scheme_1name",
- "_1soup_1cookie_1free",
"_1soup_1cookie_1jar_1add_1cookie",
"_1soup_1cookie_1jar_1all_1cookies",
"_1soup_1cookie_1jar_1delete_1cookie",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
index 917e466a27..8839532804 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h
@@ -64,7 +64,6 @@ typedef enum {
_1soup_1auth_1authenticate_FUNC,
_1soup_1auth_1get_1host_FUNC,
_1soup_1auth_1get_1scheme_1name_FUNC,
- _1soup_1cookie_1free_FUNC,
_1soup_1cookie_1jar_1add_1cookie_FUNC,
_1soup_1cookie_1jar_1all_1cookies_FUNC,
_1soup_1cookie_1jar_1delete_1cookie_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
index 5572bcd49e..785b58142c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
@@ -140,7 +140,7 @@ class WebKit extends WebBrowser {
/* indicates a session cookie */
WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie);
}
- WebKitGTK.soup_cookie_free (cookie);
+ // WebKitGTK.soup_cookie_free (cookie);
current = OS.g_slist_next (current);
}
OS.g_slist_free (cookies);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index 9c01d77046..792bccbeaa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -483,18 +483,18 @@ public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) {
}
}
-/**
- * @param cookie cast=(SoupCookie *)
- */
-public static final native void _soup_cookie_free (int /*long*/ cookie);
-public static final void soup_cookie_free (int /*long*/ cookie) {
- lock.lock();
- try {
- _soup_cookie_free (cookie);
- } finally {
- lock.unlock();
- }
-}
+///**
+// * @param cookie cast=(SoupCookie *)
+// */
+//public static final native void _soup_cookie_free (int /*long*/ cookie);
+//public static final void soup_cookie_free (int /*long*/ cookie) {
+// lock.lock();
+// try {
+// _soup_cookie_free (cookie);
+// } finally {
+// lock.unlock();
+// }
+//}
/**
* @param jar cast=(SoupCookieJar *)

Back to the top