From 84396e176bd0032b35bba22ba30ad33c8e276523 Mon Sep 17 00:00:00 2001
From: Grant Gayed <ggayed>
Date: Fri, 27 Aug 2010 17:58:26 +0000
Subject: 323763 - Eclipse 3.7 M1 crashes as it is starting up

---
 .../gtk/org/eclipse/swt/browser/WebKit.java              |  6 +++---
 .../gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse')

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 5a44c8c63f..48fe0b1eef 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	
@@ -117,7 +117,7 @@ public class WebKit extends WebBrowser {
 				public void run () {
 					if (!LibraryLoaded) return;
 					int /*long*/ session = WebKitGTK.webkit_get_default_session ();
-					int type = WebKitGTK.soup_cookie_jar_get_type ();
+					int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
 					int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
 					if (jar == 0) return;
 					int /*long*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
@@ -140,7 +140,7 @@ public class WebKit extends WebBrowser {
 				public void run () {
 					if (!LibraryLoaded) return;
 					int /*long*/ session = WebKitGTK.webkit_get_default_session ();
-					int type = WebKitGTK.soup_cookie_jar_get_type ();
+					int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
 					int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
 					if (jar == 0) return;
 					byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
@@ -173,7 +173,7 @@ public class WebKit extends WebBrowser {
 				public void run () {
 					if (!LibraryLoaded) return;
 					int /*long*/ session = WebKitGTK.webkit_get_default_session ();
-					int type = WebKitGTK.soup_cookie_jar_get_type ();
+					int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
 					int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
 					if (jar == 0) {
 						/* this happens if a navigation has not occurred yet */
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 a564b4dec7..0b1717ee96 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	
@@ -537,8 +537,8 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar,
 	}
 }
 
-public static final native int _soup_cookie_jar_get_type ();
-public static final int soup_cookie_jar_get_type () {
+public static final native int /*long*/ _soup_cookie_jar_get_type ();
+public static final int /*long*/ soup_cookie_jar_get_type () {
 	lock.lock();
 	try {
 		return _soup_cookie_jar_get_type ();
@@ -689,8 +689,8 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte
  * @param session cast=(SoupSession *)
  * @param type cast=(GType)
  */
-public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int type);
-public static final void soup_session_add_feature_by_type (int /*long*/ session, int type) {
+public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type);
+public static final void soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type) {
 	lock.lock();
 	try {
 		_soup_session_add_feature_by_type (session, type);
@@ -703,8 +703,8 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session,
  * @param session cast=(SoupSession *)
  * @param feature_type cast=(GType)
  */
-public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int feature_type);
-public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int feature_type) {
+public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type);
+public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type) {
 	lock.lock();
 	try {
 		return _soup_session_get_feature (session, feature_type);
@@ -963,8 +963,8 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) {
 	}
 }
 
-public static final native int _webkit_soup_auth_dialog_get_type ();
-public static final int webkit_soup_auth_dialog_get_type () {
+public static final native int /*long*/ _webkit_soup_auth_dialog_get_type ();
+public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
 	lock.lock();
 	try {
 		return _webkit_soup_auth_dialog_get_type ();
-- 
cgit