diff options
4 files changed, 2 insertions, 419 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 6fdf13c7da..7a40a36323 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 @@ -2560,26 +2560,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1icon) } #endif -#ifndef NO__1g_1app_1info_1get_1id -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1id) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1id_FUNC); -/* - rc = (jintLong)g_app_info_get_id(arg0); -*/ - { - OS_LOAD_FUNCTION(fp, g_app_info_get_id) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); - } - } - OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1id_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1app_1info_1get_1name JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name) (JNIEnv *env, jclass that, jintLong arg0) @@ -2738,30 +2718,6 @@ fail: } #endif -#ifndef NO__1g_1content_1type_1get_1mime_1type -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1content_1type_1get_1mime_1type) - (JNIEnv *env, jclass that, jbyteArray arg0) -{ - jbyte *lparg0=NULL; - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1content_1type_1get_1mime_1type_FUNC); - if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; -/* - rc = (jintLong)g_content_type_get_mime_type(lparg0); -*/ - { - OS_LOAD_FUNCTION(fp, g_content_type_get_mime_type) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); - } - } -fail: - if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); - OS_NATIVE_EXIT(env, that, _1g_1content_1type_1get_1mime_1type_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1content_1type_1is_1a JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1is_1a) (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) @@ -2786,26 +2742,6 @@ fail: } #endif -#ifndef NO__1g_1content_1types_1get_1registered -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1content_1types_1get_1registered) - (JNIEnv *env, jclass that) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1content_1types_1get_1registered_FUNC); -/* - rc = (jintLong)g_content_types_get_registered(); -*/ - { - OS_LOAD_FUNCTION(fp, g_content_types_get_registered) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); - } - } - OS_NATIVE_EXIT(env, that, _1g_1content_1types_1get_1registered_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1data_1input_1stream_1new JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1data_1input_1stream_1new) (JNIEnv *env, jclass that, jintLong arg0) @@ -2850,50 +2786,6 @@ fail: } #endif -#ifndef NO__1g_1desktop_1app_1info_1new_1from_1filename -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1desktop_1app_1info_1new_1from_1filename) - (JNIEnv *env, jclass that, jbyteArray arg0) -{ - jbyte *lparg0=NULL; - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1desktop_1app_1info_1new_1from_1filename_FUNC); - if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; -/* - rc = (jintLong)g_desktop_app_info_new_from_filename(lparg0); -*/ - { - OS_LOAD_FUNCTION(fp, g_desktop_app_info_new_from_filename) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); - } - } -fail: - if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); - OS_NATIVE_EXIT(env, that, _1g_1desktop_1app_1info_1new_1from_1filename_FUNC); - return rc; -} -#endif - -#ifndef NO__1g_1file_1get_1path -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1path) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1file_1get_1path_FUNC); -/* - rc = (jintLong)g_file_get_path(arg0); -*/ - { - OS_LOAD_FUNCTION(fp, g_file_get_path) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); - } - } - OS_NATIVE_EXIT(env, that, _1g_1file_1get_1path_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1file_1get_1uri JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1uri) (JNIEnv *env, jclass that, jintLong arg0) @@ -2914,26 +2806,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1uri) } #endif -#ifndef NO__1g_1file_1icon_1get_1file -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1icon_1get_1file) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1file_1icon_1get_1file_FUNC); -/* - rc = (jintLong)g_file_icon_get_file(arg0); -*/ - { - OS_LOAD_FUNCTION(fp, g_file_icon_get_file) - if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); - } - } - OS_NATIVE_EXIT(env, that, _1g_1file_1icon_1get_1file_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1file_1info_1get_1content_1type JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1info_1get_1content_1type) (JNIEnv *env, jclass that, jintLong arg0) @@ -3424,18 +3296,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1remove_1link) } #endif -#ifndef NO__1g_1list_1reverse -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1reverse) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1list_1reverse_FUNC); - rc = (jintLong)g_list_reverse((GList *)arg0); - OS_NATIVE_EXIT(env, that, _1g_1list_1reverse_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1list_1set_1next JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) @@ -3456,50 +3316,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous) } #endif -#ifndef NO__1g_1locale_1from_1utf8 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1locale_1from_1utf8) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) -{ - jintLong *lparg2=NULL; - jintLong *lparg3=NULL; - jintLong *lparg4=NULL; - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1locale_1from_1utf8_FUNC); - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)g_locale_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, _1g_1locale_1from_1utf8_FUNC); - return rc; -} -#endif - -#ifndef NO__1g_1locale_1to_1utf8 -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1locale_1to_1utf8) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4) -{ - jintLong *lparg2=NULL; - jintLong *lparg3=NULL; - jintLong *lparg4=NULL; - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1locale_1to_1utf8_FUNC); - if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail; - rc = (jintLong)g_locale_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4); -fail: - if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0); - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); - if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); - OS_NATIVE_EXIT(env, that, _1g_1locale_1to_1utf8_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1log_1default_1handler JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1default_1handler) (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) @@ -3600,18 +3416,6 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration) } #endif -#ifndef NO__1g_1main_1context_1pending -JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1pending) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1main_1context_1pending_FUNC); - rc = (jboolean)g_main_context_pending((GMainContext *)arg0); - OS_NATIVE_EXIT(env, that, _1g_1main_1context_1pending_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1main_1context_1prepare JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1prepare) (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1) @@ -4022,22 +3826,6 @@ fail: } #endif -#ifndef NO__1g_1signal_1connect_1after -JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1after) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3) -{ - jbyte *lparg1=NULL; - jint rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1after_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - rc = (jint)g_signal_connect_after((gpointer)arg0, (const gchar *)lparg1, (GCallback)arg2, (gpointer)arg3); -fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT); - OS_NATIVE_EXIT(env, that, _1g_1signal_1connect_1after_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1signal_1connect_1closure JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure) (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jboolean arg3) @@ -4231,18 +4019,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched) } #endif -#ifndef NO__1g_1signal_1handlers_1disconnect_1matched -JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1disconnect_1matched) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6) -{ - jint rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1disconnect_1matched_FUNC); - rc = (jint)g_signal_handlers_disconnect_matched((gpointer)arg0, (GSignalMatchType)arg1, (guint)arg2, (GQuark)arg3, (GClosure *)arg4, (gpointer)arg5, (gpointer)arg6); - OS_NATIVE_EXIT(env, that, _1g_1signal_1handlers_1disconnect_1matched_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1signal_1handlers_1unblock_1matched JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched) (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6) @@ -4664,18 +4440,6 @@ fail: } #endif -#ifndef NO__1g_1utf8_1offset_1to_1pointer -JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1pointer) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -{ - jintLong rc = 0; - OS_NATIVE_ENTER(env, that, _1g_1utf8_1offset_1to_1pointer_FUNC); - rc = (jintLong)g_utf8_offset_to_pointer((const gchar *)arg0, arg1); - OS_NATIVE_EXIT(env, that, _1g_1utf8_1offset_1to_1pointer_FUNC); - return rc; -} -#endif - #ifndef NO__1g_1utf8_1offset_1to_1utf16_1offset JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1utf16_1offset) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index 5f8a83c5c5..ca116cf43e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -18,8 +18,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1397; -int OS_nativeFunctionCallCount[1397]; +int OS_nativeFunctionCount = 1384; +int OS_nativeFunctionCallCount[1384]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -223,7 +223,6 @@ char * OS_nativeFunctionNames[] = { "_1g_1app_1info_1get_1default_1for_1type", "_1g_1app_1info_1get_1executable", "_1g_1app_1info_1get_1icon", - "_1g_1app_1info_1get_1id", "_1g_1app_1info_1get_1name", "_1g_1app_1info_1launch", "_1g_1app_1info_1launch_1default_1for_1uri", @@ -233,15 +232,10 @@ char * OS_nativeFunctionNames[] = { "_1g_1closure_1ref", "_1g_1closure_1unref", "_1g_1content_1type_1equals", - "_1g_1content_1type_1get_1mime_1type", "_1g_1content_1type_1is_1a", - "_1g_1content_1types_1get_1registered", "_1g_1data_1input_1stream_1new", "_1g_1data_1input_1stream_1read_1line", - "_1g_1desktop_1app_1info_1new_1from_1filename", - "_1g_1file_1get_1path", "_1g_1file_1get_1uri", - "_1g_1file_1icon_1get_1file", "_1g_1file_1info_1get_1content_1type", "_1g_1file_1info_1get_1modification_1time", "_1g_1file_1new_1for_1commandline_1arg", @@ -271,11 +265,8 @@ char * OS_nativeFunctionNames[] = { "_1g_1list_1prepend", "_1g_1list_1previous", "_1g_1list_1remove_1link", - "_1g_1list_1reverse", "_1g_1list_1set_1next", "_1g_1list_1set_1previous", - "_1g_1locale_1from_1utf8", - "_1g_1locale_1to_1utf8", "_1g_1log_1default_1handler", "_1g_1log_1remove_1handler", "_1g_1log_1set_1handler", @@ -284,7 +275,6 @@ char * OS_nativeFunctionNames[] = { "_1g_1main_1context_1default", "_1g_1main_1context_1get_1poll_1func", "_1g_1main_1context_1iteration", - "_1g_1main_1context_1pending", "_1g_1main_1context_1prepare", "_1g_1main_1context_1query", "_1g_1main_1context_1release", @@ -340,7 +330,6 @@ char * OS_nativeFunctionNames[] = { "_1g_1set_1prgname", "_1g_1signal_1add_1emission_1hook", "_1g_1signal_1connect", - "_1g_1signal_1connect_1after", "_1g_1signal_1connect_1closure", "_1g_1signal_1connect_1closure_1by_1id", #ifndef JNI64 @@ -371,7 +360,6 @@ char * OS_nativeFunctionNames[] = { "_1g_1signal_1handler_1disconnect", "_1g_1signal_1handler_1find", "_1g_1signal_1handlers_1block_1matched", - "_1g_1signal_1handlers_1disconnect_1matched", "_1g_1signal_1handlers_1unblock_1matched", "_1g_1signal_1lookup", "_1g_1signal_1remove_1emission_1hook", @@ -404,7 +392,6 @@ char * OS_nativeFunctionNames[] = { "_1g_1utf16_1pointer_1to_1offset", "_1g_1utf16_1strlen", "_1g_1utf16_1to_1utf8", - "_1g_1utf8_1offset_1to_1pointer", "_1g_1utf8_1offset_1to_1utf16_1offset", "_1g_1utf8_1pointer_1to_1offset", "_1g_1utf8_1strlen", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index cea6896104..382f4bb1a6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -231,7 +231,6 @@ typedef enum { _1g_1app_1info_1get_1default_1for_1type_FUNC, _1g_1app_1info_1get_1executable_FUNC, _1g_1app_1info_1get_1icon_FUNC, - _1g_1app_1info_1get_1id_FUNC, _1g_1app_1info_1get_1name_FUNC, _1g_1app_1info_1launch_FUNC, _1g_1app_1info_1launch_1default_1for_1uri_FUNC, @@ -241,15 +240,10 @@ typedef enum { _1g_1closure_1ref_FUNC, _1g_1closure_1unref_FUNC, _1g_1content_1type_1equals_FUNC, - _1g_1content_1type_1get_1mime_1type_FUNC, _1g_1content_1type_1is_1a_FUNC, - _1g_1content_1types_1get_1registered_FUNC, _1g_1data_1input_1stream_1new_FUNC, _1g_1data_1input_1stream_1read_1line_FUNC, - _1g_1desktop_1app_1info_1new_1from_1filename_FUNC, - _1g_1file_1get_1path_FUNC, _1g_1file_1get_1uri_FUNC, - _1g_1file_1icon_1get_1file_FUNC, _1g_1file_1info_1get_1content_1type_FUNC, _1g_1file_1info_1get_1modification_1time_FUNC, _1g_1file_1new_1for_1commandline_1arg_FUNC, @@ -279,11 +273,8 @@ typedef enum { _1g_1list_1prepend_FUNC, _1g_1list_1previous_FUNC, _1g_1list_1remove_1link_FUNC, - _1g_1list_1reverse_FUNC, _1g_1list_1set_1next_FUNC, _1g_1list_1set_1previous_FUNC, - _1g_1locale_1from_1utf8_FUNC, - _1g_1locale_1to_1utf8_FUNC, _1g_1log_1default_1handler_FUNC, _1g_1log_1remove_1handler_FUNC, _1g_1log_1set_1handler_FUNC, @@ -292,7 +283,6 @@ typedef enum { _1g_1main_1context_1default_FUNC, _1g_1main_1context_1get_1poll_1func_FUNC, _1g_1main_1context_1iteration_FUNC, - _1g_1main_1context_1pending_FUNC, _1g_1main_1context_1prepare_FUNC, _1g_1main_1context_1query_FUNC, _1g_1main_1context_1release_FUNC, @@ -348,7 +338,6 @@ typedef enum { _1g_1set_1prgname_FUNC, _1g_1signal_1add_1emission_1hook_FUNC, _1g_1signal_1connect_FUNC, - _1g_1signal_1connect_1after_FUNC, _1g_1signal_1connect_1closure_FUNC, _1g_1signal_1connect_1closure_1by_1id_FUNC, #ifndef JNI64 @@ -379,7 +368,6 @@ typedef enum { _1g_1signal_1handler_1disconnect_FUNC, _1g_1signal_1handler_1find_FUNC, _1g_1signal_1handlers_1block_1matched_FUNC, - _1g_1signal_1handlers_1disconnect_1matched_FUNC, _1g_1signal_1handlers_1unblock_1matched_FUNC, _1g_1signal_1lookup_FUNC, _1g_1signal_1remove_1emission_1hook_FUNC, @@ -412,7 +400,6 @@ typedef enum { _1g_1utf16_1pointer_1to_1offset_FUNC, _1g_1utf16_1strlen_FUNC, _1g_1utf16_1to_1utf8_FUNC, - _1g_1utf8_1offset_1to_1pointer_FUNC, _1g_1utf8_1offset_1to_1utf16_1offset_FUNC, _1g_1utf8_1pointer_1to_1offset_FUNC, _1g_1utf8_1strlen_FUNC, 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 b65444d8b3..0d47149d6b 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 @@ -1876,16 +1876,6 @@ public static final int /*long*/ g_app_info_get_icon(int /*long*/ appInfo) { } } /** @method flags=dynamic */ -public static final native int /*long*/ _g_app_info_get_id(int /*long*/ appInfo); -public static final int /*long*/ g_app_info_get_id(int /*long*/ appInfo) { - lock.lock(); - try { - return _g_app_info_get_id(appInfo); - } finally { - lock.unlock(); - } -} -/** @method flags=dynamic */ public static final native int /*long*/ _g_app_info_get_name(int /*long*/ appInfo); public static final int /*long*/ g_app_info_get_name(int /*long*/ appInfo) { lock.lock(); @@ -1986,36 +1976,6 @@ public static final boolean g_content_type_is_a(int /*long*/ type, byte[] supert } } /** @method flags=dynamic */ -public static final native int /*long*/ _g_content_type_get_mime_type(byte[] mime_type); -public static final int /*long*/ g_content_type_get_mime_type(byte[] mime_type) { - lock.lock(); - try { - return _g_content_type_get_mime_type(mime_type); - } finally { - lock.unlock(); - } -} -/** @method flags=dynamic */ -public static final native int /*long*/ _g_content_types_get_registered(); -public static final int /*long*/ g_content_types_get_registered() { - lock.lock(); - try { - return _g_content_types_get_registered(); - } finally { - lock.unlock(); - } -} -/** @method flags=dynamic */ -public static final native int /*long*/ _g_desktop_app_info_new_from_filename(byte[] fileName); -public static final int /*long*/ g_desktop_app_info_new_from_filename(byte[] fileName) { - lock.lock(); - try { - return _g_desktop_app_info_new_from_filename(fileName); - } finally { - lock.unlock(); - } -} -/** @method flags=dynamic */ public static final native int /*long*/ _g_file_info_get_content_type (int /*long*/ info); public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info) { lock.lock(); @@ -2026,16 +1986,6 @@ public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info } } /** @method flags=dynamic */ -public static final native int /*long*/ _g_file_get_path(int /*long*/ file); -public static final int /*long*/ g_file_get_path (int /*long*/ file) { - lock.lock(); - try { - return _g_file_get_path(file); - } finally { - lock.unlock(); - } -} -/** @method flags=dynamic */ public static final native int /*long*/ _g_file_get_uri(int /*long*/ file); public static final int /*long*/ g_file_get_uri (int /*long*/ file) { lock.lock(); @@ -2056,16 +2006,6 @@ public static final void g_file_info_get_modification_time(int /*long*/ info, in } } /** @method flags=dynamic */ -public static final native int /*long*/ _g_file_icon_get_file(int /*long*/ icon); -public static final int /*long*/ g_file_icon_get_file(int /*long*/ icon) { - lock.lock(); - try { - return _g_file_icon_get_file(icon); - } finally { - lock.unlock(); - } -} -/** @method flags=dynamic */ public static final native int /*long*/ _g_file_new_for_path(byte[] fileName); public static final int /*long*/ g_file_new_for_path(byte[] fileName) { lock.lock(); @@ -2252,16 +2192,6 @@ public static final boolean g_main_context_iteration(int /*long*/ context, boole } } /** @param context cast=(GMainContext *) */ -public static final native boolean _g_main_context_pending(int /*long*/ context); -public static final boolean g_main_context_pending(int /*long*/ context) { - lock.lock(); - try { - return _g_main_context_pending(context); - } finally { - lock.unlock(); - } -} -/** @param context cast=(GMainContext *) */ public static final native int /*long*/ _g_main_context_get_poll_func(int /*long*/ context); public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ context) { lock.lock(); @@ -2562,48 +2492,6 @@ public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*lon lock.unlock(); } } -/** @param list cast=(GList *) */ -public static final native int /*long*/ _g_list_reverse(int /*long*/ list); -public static final int /*long*/ g_list_reverse(int /*long*/ list) { - lock.lock(); - try { - return _g_list_reverse(list); - } finally { - lock.unlock(); - } -} -/** - * @param utf8string cast=(const gchar *) - * @param len cast=(gssize) - * @param bytes_read cast=(gsize *) - * @param bytes_written cast=(gsize *) - * @param error cast=(GError **) - */ -public static final native int /*long*/ _g_locale_from_utf8(int /*long*/ utf8string, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error); -public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) { - lock.lock(); - try { - return _g_locale_from_utf8(utf8string, len, bytes_read, bytes_written, error); - } finally { - lock.unlock(); - } -} -/** - * @param opsysstring cast=(const gchar *) - * @param len cast=(gssize) - * @param bytes_read cast=(gsize *) - * @param bytes_written cast=(gsize *) - * @param error cast=(GError **) - */ -public static final native int /*long*/ _g_locale_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error); -public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) { - lock.lock(); - try { - return _g_locale_to_utf8(opsysstring, len, bytes_read, bytes_written, error); - } finally { - lock.unlock(); - } -} /** * @param log_domain cast=(gchar *) * @param log_levels cast=(GLogLevelFlags) @@ -2924,21 +2812,6 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in /** * @param instance cast=(gpointer) * @param detailed_signal cast=(const gchar *),flags=no_out - * @param proc cast=(GCallback) - * @param data cast=(gpointer) - */ -public static final native int _g_signal_connect_after(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data); -public static final int g_signal_connect_after(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data) { - lock.lock(); - try { - return _g_signal_connect_after(instance, detailed_signal, proc, data); - } finally { - lock.unlock(); - } -} -/** - * @param instance cast=(gpointer) - * @param detailed_signal cast=(const gchar *),flags=no_out */ public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal); public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal) { @@ -3057,24 +2930,6 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i * @param func cast=(gpointer) * @param data cast=(gpointer) */ -public static final native int _g_signal_handlers_disconnect_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data); -public static final int g_signal_handlers_disconnect_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) { - lock.lock(); - try { - return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data); - } finally { - lock.unlock(); - } -} -/** - * @param instance cast=(gpointer) - * @param mask cast=(GSignalMatchType) - * @param signal_id cast=(guint) - * @param detail cast=(GQuark) - * @param closure cast=(GClosure *) - * @param func cast=(gpointer) - * @param data cast=(gpointer) - */ public static final native int _g_signal_handlers_unblock_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data); public static final int g_signal_handlers_unblock_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) { lock.lock(); @@ -3389,16 +3244,6 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i lock.unlock(); } } -/** @param str cast=(const gchar *) */ -public static final native int /*long*/ _g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset); -public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset) { - lock.lock(); - try { - return _g_utf8_offset_to_pointer(str, offset); - } finally { - lock.unlock(); - } -} /** * @param str cast=(const gchar *) * @param pos cast=(const gchar *) |