aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-04-12 15:59:43 (EDT)
committerAlexander Kurtakov2013-01-23 09:45:28 (EST)
commitc83258c29ec61b13bf051a01a99d1aedb919d805 (patch)
tree1b400793a3a751217600f59572a05e682e797a9f
parent2eb61f092499f685c2da411e9abd5e905eda178d (diff)
downloadeclipse.platform.swt-c83258c29ec61b13bf051a01a99d1aedb919d805.zip
eclipse.platform.swt-c83258c29ec61b13bf051a01a99d1aedb919d805.tar.gz
eclipse.platform.swt-c83258c29ec61b13bf051a01a99d1aedb919d805.tar.bz2
Remove gnome_vfs* unused function bindings.
They are no longer needed after the gnome/gnome_24 unification.
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c46
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.h6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java42
4 files changed, 6 insertions, 94 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c
index df76c02..84a7788 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2013 IBM Corporation and others. All rights reserved.
* The contents of this file are made available under the terms
* of the GNU Lesser General Public License (LGPL) Version 2.1 that
* accompanies this distribution (lgpl-v21.txt). The LGPL is also
@@ -101,18 +101,6 @@ JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1get_1mime_1type)
}
#endif
-#ifndef NO__1gnome_1vfs_1get_1registered_1mime_1types
-JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1get_1registered_1mime_1types)
- (JNIEnv *env, jclass that)
-{
- jintLong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1get_1registered_1mime_1types_FUNC);
- rc = (jintLong)gnome_vfs_get_registered_mime_types();
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1get_1registered_1mime_1types_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO__1gnome_1vfs_1init
JNIEXPORT jboolean JNICALL GNOME_NATIVE(_1gnome_1vfs_1init)
(JNIEnv *env, jclass that)
@@ -211,16 +199,6 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch)
}
#endif
-#ifndef NO__1gnome_1vfs_1mime_1extensions_1list_1free
-JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1extensions_1list_1free)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1extensions_1list_1free_FUNC);
- gnome_vfs_mime_extensions_list_free((GList *)arg0);
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1extensions_1list_1free_FUNC);
-}
-#endif
-
#ifndef NO__1gnome_1vfs_1mime_1get_1default_1application
JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1default_1application)
(JNIEnv *env, jclass that, jbyteArray arg0)
@@ -237,28 +215,6 @@ fail:
}
#endif
-#ifndef NO__1gnome_1vfs_1mime_1get_1extensions_1list
-JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- jintLong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC);
- rc = (jintLong)gnome_vfs_mime_get_extensions_list((const char *)arg0);
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC);
- return rc;
-}
-#endif
-
-#ifndef NO__1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free
-JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free_FUNC);
- gnome_vfs_mime_registered_mime_type_list_free((GList *)arg0);
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free_FUNC);
-}
-#endif
-
#ifndef NO__1gnome_1vfs_1mime_1type_1from_1name
JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1type_1from_1name)
(JNIEnv *env, jclass that, jbyteArray arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c
index cef7ac3..857e003 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2013 IBM Corporation and others. All rights reserved.
* The contents of this file are made available under the terms
* of the GNU Lesser General Public License (LGPL) Version 2.1 that
* accompanies this distribution (lgpl-v21.txt). The LGPL is also
@@ -24,17 +24,13 @@ char * GNOME_nativeFunctionNames[] = {
"_1gnome_1icon_1theme_1lookup_1icon",
"_1gnome_1icon_1theme_1new",
"_1gnome_1vfs_1get_1mime_1type",
- "_1gnome_1vfs_1get_1registered_1mime_1types",
"_1gnome_1vfs_1init",
"_1gnome_1vfs_1is_1executable_1command_1string",
"_1gnome_1vfs_1make_1uri_1from_1input",
"_1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs",
"_1gnome_1vfs_1mime_1application_1free",
"_1gnome_1vfs_1mime_1application_1launch",
- "_1gnome_1vfs_1mime_1extensions_1list_1free",
"_1gnome_1vfs_1mime_1get_1default_1application",
- "_1gnome_1vfs_1mime_1get_1extensions_1list",
- "_1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free",
"_1gnome_1vfs_1mime_1type_1from_1name",
"_1gnome_1vfs_1mime_1type_1get_1equivalence",
"_1gnome_1vfs_1url_1show",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.h
index 9de0b5b..4004fae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/library/gnome_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2013 IBM Corporation and others. All rights reserved.
* The contents of this file are made available under the terms
* of the GNU Lesser General Public License (LGPL) Version 2.1 that
* accompanies this distribution (lgpl-v21.txt). The LGPL is also
@@ -34,17 +34,13 @@ typedef enum {
_1gnome_1icon_1theme_1lookup_1icon_FUNC,
_1gnome_1icon_1theme_1new_FUNC,
_1gnome_1vfs_1get_1mime_1type_FUNC,
- _1gnome_1vfs_1get_1registered_1mime_1types_FUNC,
_1gnome_1vfs_1init_FUNC,
_1gnome_1vfs_1is_1executable_1command_1string_FUNC,
_1gnome_1vfs_1make_1uri_1from_1input_FUNC,
_1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs_FUNC,
_1gnome_1vfs_1mime_1application_1free_FUNC,
_1gnome_1vfs_1mime_1application_1launch_FUNC,
- _1gnome_1vfs_1mime_1extensions_1list_1free_FUNC,
_1gnome_1vfs_1mime_1get_1default_1application_FUNC,
- _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC,
- _1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free_FUNC,
_1gnome_1vfs_1mime_1type_1from_1name_FUNC,
_1gnome_1vfs_1mime_1type_1get_1equivalence_FUNC,
_1gnome_1vfs_1url_1show_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java
index a2fe309..6b8dad5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java
@@ -80,15 +80,7 @@ public static final long /*int*/ gnome_icon_theme_new() {
lock.unlock();
}
}
-public static final native long /*int*/ _gnome_vfs_get_registered_mime_types();
-public static final long /*int*/ gnome_vfs_get_registered_mime_types() {
- lock.lock();
- try {
- return _gnome_vfs_get_registered_mime_types();
- } finally {
- lock.unlock();
- }
-}
+
/** @param uri cast=(const char *) */
public static final native long /*int*/ _gnome_vfs_get_mime_type(long /*int*/ uri);
public static final long /*int*/ gnome_vfs_get_mime_type(long /*int*/ uri) {
@@ -166,16 +158,7 @@ public static final int gnome_vfs_mime_application_launch(long /*int*/ applicati
lock.unlock();
}
}
-/** @param list cast=(GList *) */
-public static final native void _gnome_vfs_mime_extensions_list_free(long /*int*/ list);
-public static final void gnome_vfs_mime_extensions_list_free(long /*int*/ list) {
- lock.lock();
- try {
- _gnome_vfs_mime_extensions_list_free(list);
- } finally {
- lock.unlock();
- }
-}
+
/** @param mimeType cast=(const char *) */
public static final native long /*int*/ _gnome_vfs_mime_get_default_application(byte[] mimeType);
public static final long /*int*/ gnome_vfs_mime_get_default_application(byte[] mimeType) {
@@ -186,26 +169,7 @@ public static final long /*int*/ gnome_vfs_mime_get_default_application(byte[] m
lock.unlock();
}
}
-/** @param mime_type cast=(const char *) */
-public static final native long /*int*/ _gnome_vfs_mime_get_extensions_list(long /*int*/ mime_type);
-public static final long /*int*/ gnome_vfs_mime_get_extensions_list(long /*int*/ mime_type) {
- lock.lock();
- try {
- return _gnome_vfs_mime_get_extensions_list(mime_type);
- } finally {
- lock.unlock();
- }
-}
-/** @param list cast=(GList *) */
-public static final native void _gnome_vfs_mime_registered_mime_type_list_free(long /*int*/ list);
-public static final void gnome_vfs_mime_registered_mime_type_list_free(long /*int*/ list) {
- lock.lock();
- try {
- _gnome_vfs_mime_registered_mime_type_list_free(list);
- } finally {
- lock.unlock();
- }
-}
+
/** @param file cast=(const char *) */
public static final native long /*int*/ _gnome_vfs_mime_type_from_name(byte[] file);
public static final long /*int*/ gnome_vfs_mime_type_from_name(byte[] file) {