Bug 502859 - Make all libgio non-dynamic

GTK 2.24 requires new enough glib to have all the gio functionality we
need.

Change-Id: I82d5bf32a9570ac31f5f8939856826ee36548707
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

3 files changed, 93 insertions, 242 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 0ffcee979c..b56028e756 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -2066,15 +2066,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1create_1from_1commandline)
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1create_1from_1commandline_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)g_app_info_create_from_commandline(lparg0, lparg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_create_from_commandline)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jintLong, jintLong))fp)(lparg0, lparg1, arg2, arg3);
-		}
-	}
+	rc = (jintLong)g_app_info_create_from_commandline((gchar *)lparg0, (gchar *)lparg1, (GAppInfoCreateFlags)arg2, (GError **)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
@@ -2089,15 +2081,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1all)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1all_FUNC);
-/*
 	rc = (jintLong)g_app_info_get_all();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_get_all)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
-		}
-	}
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1all_FUNC);
 	return rc;
 }
@@ -2111,15 +2095,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1default_1for_1type)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1default_1for_1type_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)g_app_info_get_default_for_type(lparg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_get_default_for_type)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jboolean))fp)(lparg0, arg1);
-		}
-	}
+	rc = (jintLong)g_app_info_get_default_for_type((gchar *)lparg0, (gboolean)arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1default_1for_1type_FUNC);
@@ -2133,15 +2109,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1executable)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1executable_FUNC);
-/*
-	rc = (jintLong)g_app_info_get_executable(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_get_executable)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)g_app_info_get_executable((GAppInfo *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1executable_FUNC);
 	return rc;
 }
@@ -2153,15 +2121,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1icon)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1icon_FUNC);
-/*
-	rc = (jintLong)g_app_info_get_icon(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_get_icon)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)g_app_info_get_icon((GAppInfo *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1icon_FUNC);
 	return rc;
 }
@@ -2173,15 +2133,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1name_FUNC);
-/*
-	rc = (jintLong)g_app_info_get_name(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_get_name)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)g_app_info_get_name((GAppInfo *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1name_FUNC);
 	return rc;
 }
@@ -2193,15 +2145,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1launch_FUNC);
-/*
-	rc = (jboolean)g_app_info_launch(arg0, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_launch)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3);
-		}
-	}
+	rc = (jboolean)g_app_info_launch((GAppInfo *)arg0, (GList *)arg1, (GAppLaunchContext *)arg2, (GError **)arg3);
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1launch_FUNC);
 	return rc;
 }
@@ -2213,15 +2157,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch_1default_1for_1uri)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1launch_1default_1for_1uri_FUNC);
-/*
-	rc = (jboolean)g_app_info_launch_default_for_uri(arg0, arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_launch_default_for_uri)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
-		}
-	}
+	rc = (jboolean)g_app_info_launch_default_for_uri((char *)arg0, (GAppLaunchContext *)arg1, (GError **)arg2);
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1launch_1default_1for_1uri_FUNC);
 	return rc;
 }
@@ -2233,15 +2169,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1should_1show)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1should_1show_FUNC);
-/*
-	rc = (jboolean)g_app_info_should_show(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_should_show)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jboolean)g_app_info_should_show((GAppInfo *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1should_1show_FUNC);
 	return rc;
 }
@@ -2253,15 +2181,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1supports_1uris)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1supports_1uris_FUNC);
-/*
-	rc = (jboolean)g_app_info_supports_uris(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_app_info_supports_uris)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jboolean)g_app_info_supports_uris((GAppInfo *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1supports_1uris_FUNC);
 	return rc;
 }
@@ -2319,15 +2239,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1equals)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1content_1type_1equals_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)g_content_type_equals(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_content_type_equals)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
-		}
-	}
+	rc = (jboolean)g_content_type_equals((gchar *)arg0, (gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1content_1type_1equals_FUNC);
@@ -2343,15 +2255,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1is_1a)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1content_1type_1is_1a_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)g_content_type_is_a(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_content_type_is_a)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
-		}
-	}
+	rc = (jboolean)g_content_type_is_a((gchar *)arg0, (gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1content_1type_1is_1a_FUNC);
@@ -2377,15 +2281,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1uri)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1file_1get_1uri_FUNC);
-/*
-	rc = (jintLong)g_file_get_uri(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_file_get_uri)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)g_file_get_uri((GFile *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1file_1get_1uri_FUNC);
 	return rc;
 }
@@ -2397,15 +2293,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1info_1get_1content_1type)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1file_1info_1get_1content_1type_FUNC);
-/*
-	rc = (jintLong)g_file_info_get_content_type(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_file_info_get_content_type)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)g_file_info_get_content_type((GFileInfo *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1file_1info_1get_1content_1type_FUNC);
 	return rc;
 }
@@ -2419,15 +2307,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)g_file_new_for_commandline_arg(lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_file_new_for_commandline_arg)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
-		}
-	}
+	rc = (jintLong)g_file_new_for_commandline_arg((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
@@ -2443,15 +2323,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1path_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)g_file_new_for_path(lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_file_new_for_path)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
-		}
-	}
+	rc = (jintLong)g_file_new_for_path((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1path_FUNC);
@@ -2467,15 +2339,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1uri)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1uri_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)g_file_new_for_uri(lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_file_new_for_uri)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
-		}
-	}
+	rc = (jintLong)g_file_new_for_uri((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1uri_FUNC);
@@ -2491,15 +2355,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1query_1info)
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1file_1query_1info_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)g_file_query_info(arg0, lparg1, arg2, arg3, arg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_file_query_info)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jintLong, jintLong))fp)(arg0, lparg1, arg2, arg3, arg4);
-		}
-	}
+	rc = (jintLong)g_file_query_info((GFile *)arg0, (const char *)lparg1, (GFileQueryInfoFlags)arg2, (GCancellable *)arg3, (GError **)arg4);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1file_1query_1info_FUNC);
@@ -2515,15 +2371,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1file_1test)
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1file_1test_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)g_file_test(lparg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_file_test)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jbyte *, jint))fp)(lparg0, arg1);
-		}
-	}
+	rc = (jboolean)g_file_test((const gchar *)lparg0, (GFileTest)arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1file_1test_FUNC);
@@ -2670,15 +2518,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1new_1for_1string)
 	OS_NATIVE_ENTER(env, that, _1g_1icon_1new_1for_1string_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)g_icon_new_for_string(lparg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_icon_new_for_string)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jintLong *))fp)(lparg0, lparg1);
-		}
-	}
+	rc = (jintLong)g_icon_new_for_string((const gchar *)lparg0, (GError **)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
@@ -2693,15 +2533,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1to_1string)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1icon_1to_1string_FUNC);
-/*
-	rc = (jintLong)g_icon_to_string(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_icon_to_string)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)g_icon_to_string((GIcon *)arg0);
 	OS_NATIVE_EXIT(env, that, _1g_1icon_1to_1string_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
index 7a682d997e..ea4602af88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
@@ -37,7 +37,6 @@
 #define LIB_GOBJECT "libgobject-2.0.a(libgobject-2.0.so.0)"
 #define LIB_GTHREAD "libgthread-2.0.a(libgthread-2.0.so.0)"
 #define LIB_ATK "libatk-1.0.a(libatk-1.0.so.0)"
-#define LIB_GIO "libgio-2.0.a(libgio-2.0.so.0)"
 #define LIB_FONTCONFIG "libfontconfig.a(libfontconfig.so.1)"
 #elif HPUX
 #define LIB_XRENDER "libXrender.so"
@@ -47,7 +46,6 @@
 #define LIB_GOBJECT "libgobject-2.0.so"
 #define LIB_GTHREAD "libgthread-2.0.so"
 #define LIB_ATK "libatk-1.0.so"
-#define LIB_GIO "libgio-2.0.so"
 #define LIB_FONTCONFIG "libfontconfig.so"
 #else
 #define LIB_XRENDER "libXrender.so"
@@ -62,7 +60,6 @@
 #define LIB_GOBJECT "libgobject-2.0.so.0"
 #define LIB_GTHREAD "libgthread-2.0.so.0"
 #define LIB_ATK "libatk-1.0.so.0"
-#define LIB_GIO "libgio-2.0.so.0"
 #define LIB_FONTCONFIG "libfontconfig.so.1"
 #endif
 
@@ -405,34 +402,6 @@
 #define ubuntu_menu_proxy_get_LIB LIB_GTK
 #define FcConfigAppFontAddFile_LIB LIB_FONTCONFIG
 
-#define g_app_info_create_from_commandline_LIB LIB_GIO
-#define g_app_info_get_all_LIB LIB_GIO
-#define g_app_info_get_executable_LIB LIB_GIO
-#define g_app_info_get_icon_LIB LIB_GIO
-#define g_app_info_get_id_LIB LIB_GIO
-#define g_app_info_get_name_LIB LIB_GIO
-#define g_app_info_launch_LIB LIB_GIO
-#define g_app_info_get_default_for_type_LIB LIB_GIO
-#define g_app_info_launch_default_for_uri_LIB LIB_GIO
-#define g_app_info_supports_uris_LIB LIB_GIO
-#define g_app_info_should_show_LIB LIB_GIO
-#define g_content_type_equals_LIB LIB_GIO
-#define g_content_type_get_mime_type_LIB LIB_GIO
-#define g_content_type_is_a_LIB LIB_GIO
-#define g_content_types_get_registered_LIB LIB_GIO
-#define g_desktop_app_info_new_from_filename_LIB LIB_GIO
-#define g_file_get_path_LIB LIB_GIO
-#define g_file_get_uri_LIB LIB_GIO
-#define g_file_icon_get_file_LIB LIB_GIO
-#define g_file_info_get_content_type_LIB LIB_GIO
-#define g_file_new_for_commandline_arg_LIB LIB_GIO
-#define g_file_new_for_path_LIB LIB_GIO
-#define g_file_new_for_uri_LIB LIB_GIO
-#define g_file_test_LIB LIB_GIO
-#define g_icon_to_string_LIB LIB_GIO
-#define g_icon_new_for_string_LIB LIB_GIO
-#define g_file_query_info_LIB LIB_GIO
-
 // GTK3 only
 #define gtk_widget_draw_LIB LIB_GTK
 #define gtk_widget_override_color_LIB LIB_GTK
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 41225f0c8f..6150607a17 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -1912,7 +1912,12 @@ public static final long /*int*/ dlsym(long /*int*/ handle, byte[] symbol) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param commandline cast=(gchar *)
+ * @param applName cast=(gchar *)
+ * @param flags cast=(GAppInfoCreateFlags)
+ * @param error cast=(GError **)
+ */
 public static final native long /*int*/ _g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long /*int*/ flags, long /*int*/ error);
 public static final long /*int*/ g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long /*int*/ flags, long /*int*/ error) {
 	lock.lock();
@@ -1922,7 +1927,6 @@ public static final long /*int*/ g_app_info_create_from_commandline(byte[] comma
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
 public static final native long /*int*/ _g_app_info_get_all();
 public static final long /*int*/ g_app_info_get_all() {
 	lock.lock();
@@ -1932,7 +1936,9 @@ public static final long /*int*/ g_app_info_get_all() {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param appInfo cast=(GAppInfo *)
+ */
 public static final native long /*int*/ _g_app_info_get_executable(long /*int*/ appInfo);
 public static final long /*int*/ g_app_info_get_executable(long /*int*/ appInfo) {
 	lock.lock();
@@ -1942,7 +1948,9 @@ public static final long /*int*/ g_app_info_get_executable(long /*int*/ appInfo)
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param appInfo cast=(GAppInfo *)
+ */
 public static final native long /*int*/ _g_app_info_get_icon(long /*int*/ appInfo);
 public static final long /*int*/ g_app_info_get_icon(long /*int*/ appInfo) {
 	lock.lock();
@@ -1952,7 +1960,9 @@ public static final long /*int*/ g_app_info_get_icon(long /*int*/ appInfo) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param appInfo cast=(GAppInfo *)
+ */
 public static final native long /*int*/ _g_app_info_get_name(long /*int*/ appInfo);
 public static final long /*int*/ g_app_info_get_name(long /*int*/ appInfo) {
 	lock.lock();
@@ -1962,7 +1972,12 @@ public static final long /*int*/ g_app_info_get_name(long /*int*/ appInfo) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param appInfo cast=(GAppInfo *)
+ * @param list cast=(GList *)
+ * @param launchContext cast=(GAppLaunchContext *)
+ * @param error cast=(GError **)
+ */
 public static final native boolean _g_app_info_launch(long /*int*/ appInfo, long /*int*/ list, long /*int*/ launchContext, long /*int*/ error);
 public static final boolean g_app_info_launch(long /*int*/ appInfo, long /*int*/ list, long /*int*/ launchContext, long /*int*/ error) {
 	lock.lock();
@@ -1972,7 +1987,10 @@ public static final boolean g_app_info_launch(long /*int*/ appInfo, long /*int*/
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param mimeType cast=(gchar *)
+ * @param mustSupportURIs cast=(gboolean)
+ */
 public static final native long /*int*/ _g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs);
 public static final long /*int*/ g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs) {
 	lock.lock();
@@ -1982,17 +2000,23 @@ public static final long /*int*/ g_app_info_get_default_for_type(byte[] mimeType
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param uri cast=(char *)
+ * @param launchContext cast=(GAppLaunchContext *)
+ * @param error cast=(GError **)
+ */
 public static final native boolean _g_app_info_launch_default_for_uri(long /*int*/ uri, long /*int*/ launchContext, long /*int*/ error);
-public static final boolean g_app_info_launch_default_for_uri(long /*int*/ appInfo, long /*int*/ launchContext, long /*int*/ error) {
+public static final boolean g_app_info_launch_default_for_uri(long /*int*/ uri, long /*int*/ launchContext, long /*int*/ error) {
 	lock.lock();
 	try {
-		return _g_app_info_launch_default_for_uri(appInfo, launchContext, error);
+		return _g_app_info_launch_default_for_uri(uri, launchContext, error);
 	} finally {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param appInfo cast=(GAppInfo *)
+ */
 public static final native boolean _g_app_info_should_show(long /*int*/ appInfo);
 public static final boolean g_app_info_should_show(long /*int*/ appInfo) {
 	lock.lock();
@@ -2002,7 +2026,9 @@ public static final boolean g_app_info_should_show(long /*int*/ appInfo) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param appInfo cast=(GAppInfo *)
+ */
 public static final native boolean _g_app_info_supports_uris(long /*int*/ appInfo);
 public static final boolean g_app_info_supports_uris(long /*int*/ appInfo) {
 	lock.lock();
@@ -2024,7 +2050,10 @@ public static final long /*int*/ g_error_get_message (long /*int*/ error) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param type1 cast=(gchar *)
+ * @param type2 cast=(gchar *)
+ */
 public static final native boolean _g_content_type_equals(long /*int*/ type1, byte[] type2);
 public static final boolean g_content_type_equals(long /*int*/ type1, byte[] type2) {
 	lock.lock();
@@ -2034,7 +2063,10 @@ public static final boolean g_content_type_equals(long /*int*/ type1, byte[] typ
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param type cast=(gchar *)
+ * @param supertype cast=(gchar *)
+ */
 public static final native boolean _g_content_type_is_a(long /*int*/ type, byte[] supertype);
 public static final boolean g_content_type_is_a(long /*int*/ type, byte[] supertype) {
 	lock.lock();
@@ -2044,7 +2076,9 @@ public static final boolean g_content_type_is_a(long /*int*/ type, byte[] supert
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param info cast=(GFileInfo *)
+ */
 public static final native long /*int*/ _g_file_info_get_content_type (long /*int*/ info);
 public static final long /*int*/ g_file_info_get_content_type (long /*int*/ info) {
 	lock.lock();
@@ -2054,7 +2088,9 @@ public static final long /*int*/ g_file_info_get_content_type (long /*int*/ info
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param file cast=(GFile *)
+ */
 public static final native long /*int*/ _g_file_get_uri(long /*int*/ file);
 public static final long /*int*/ g_file_get_uri (long /*int*/ file) {
 	lock.lock();
@@ -2064,7 +2100,7 @@ public static final long /*int*/ g_file_get_uri (long /*int*/ file) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** @param fileName cast=(const char *) */
 public static final native long /*int*/ _g_file_new_for_path(byte[] fileName);
 public static final long /*int*/ g_file_new_for_path(byte[] fileName) {
 	lock.lock();
@@ -2074,7 +2110,9 @@ public static final long /*int*/ g_file_new_for_path(byte[] fileName) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param fileName cast=(const char *)
+ */
 public static final native long /*int*/ _g_file_new_for_commandline_arg(byte[] fileName);
 public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName) {
 	lock.lock();
@@ -2084,7 +2122,7 @@ public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName)
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** @param fileName cast=(const char *) */
 public static final native long /*int*/ _g_file_new_for_uri(byte[] fileName);
 public static final long /*int*/ g_file_new_for_uri(byte[] fileName) {
 	lock.lock();
@@ -2094,7 +2132,13 @@ public static final long /*int*/ g_file_new_for_uri(byte[] fileName) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param file cast=(GFile *)
+ * @param attributes cast=(const char *)
+ * @param flags cast=(GFileQueryInfoFlags)
+ * @param cancellable cast=(GCancellable *)
+ * @param error cast=(GError **)
+ */
 public static final native long /*int*/ _g_file_query_info  (long /*int*/ file, byte[] attributes, long /*int*/ flags, long /*int*/ cancellable, long /*int*/ error);
 public static final long /*int*/ g_file_query_info  (long /*int*/ file,byte[] attributes, long /*int*/ flags, long /*int*/ cancellable, long /*int*/ error) {
 	lock.lock();
@@ -2104,7 +2148,10 @@ public static final long /*int*/ g_file_query_info  (long /*int*/ file,byte[] at
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param file cast=(const gchar *)
+ * @param test cast=(GFileTest)
+ */
 public static final native boolean /*long*/ _g_file_test(byte[] file, int test);
 public static final boolean /*long*/ g_file_test(byte[] file, int test) {
 	lock.lock();
@@ -2114,7 +2161,7 @@ public static final boolean /*long*/ g_file_test(byte[] file, int test) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** @param icon cast=(GIcon *) */
 public static final native long /*int*/ _g_icon_to_string(long /*int*/ icon);
 public static final long /*int*/ g_icon_to_string (long /*int*/ icon) {
 	lock.lock();
@@ -2124,7 +2171,10 @@ public static final long /*int*/ g_icon_to_string (long /*int*/ icon) {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param str cast=(const gchar *)
+ * @param error cast=(GError **)
+ */
 public static final native long /*int*/ _g_icon_new_for_string(byte[] str, long /*int*/ error[]);
 public static final long /*int*/ g_icon_new_for_string (byte[] str, long /*int*/ error[]) {
 	lock.lock();