Make gtk_icon_source* functions dynamic.

Used only in theme and deprecated in gtk 3.9.x.

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

3 files changed, 33 insertions, 1 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 58643fc3e1..e7bb60deb9 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
@@ -11109,7 +11109,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1free)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1free_FUNC);
+/*
 	gtk_icon_source_free((GtkIconSource *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_icon_source_free)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkIconSource *))fp)((GtkIconSource *)arg0);
+		}
+	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1source_1free_FUNC);
 }
 #endif
@@ -11120,7 +11128,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1new_FUNC);
+/*
 	rc = (jintLong)gtk_icon_source_new();
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_icon_source_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+		}
+	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1source_1new_FUNC);
 	return rc;
 }
@@ -11131,7 +11147,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1set_1pixbuf)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1set_1pixbuf_FUNC);
+/*
 	gtk_icon_source_set_pixbuf((GtkIconSource *)arg0, (GdkPixbuf *)arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_icon_source_set_pixbuf)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GtkIconSource *, GdkPixbuf *))fp)((GtkIconSource *)arg0, (GdkPixbuf *)arg1);
+		}
+	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1source_1set_1pixbuf_FUNC);
 }
 #endif
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 18de557115..6d6392634e 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
@@ -177,6 +177,9 @@
 #define gtk_icon_info_free_LIB LIB_GTK
 #define gtk_icon_set_render_icon_LIB LIB_GTK
 #define gtk_icon_theme_lookup_by_gicon_LIB LIB_GTK
+#define gtk_icon_source_free_LIB LIB_GTK
+#define gtk_icon_source_new_LIB LIB_GTK
+#define gtk_icon_source_set_pixbuf_LIB LIB_GTK
 #define gtk_image_set_from_gicon_LIB LIB_GTK
 #define gdk_keyboard_ungrab_LIB LIB_GDK
 #define gtk_icon_theme_get_default_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 e76357d4cb..59c2960e06 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
@@ -8015,7 +8015,10 @@ public static final long /*int*/ gtk_icon_factory_lookup_default(byte[] stock_id
 		lock.unlock();
 	}
 }
-/** @param source cast=(GtkIconSource *) */
+/** 
+ * @method flags=dynamic
+ * @param source cast=(GtkIconSource *) 
+ */
 public static final native void _gtk_icon_source_free(long /*int*/ source);
 public static final void gtk_icon_source_free(long /*int*/ source) {
 	lock.lock();
@@ -8025,6 +8028,7 @@ public static final void gtk_icon_source_free(long /*int*/ source) {
 		lock.unlock();
 	}
 }
+/** @method flags=dynamic */
 public static final native long /*int*/ _gtk_icon_source_new();
 public static final long /*int*/ gtk_icon_source_new() {
 	lock.lock();
@@ -8035,6 +8039,7 @@ public static final long /*int*/ gtk_icon_source_new() {
 	}
 }
 /**
+ * @method flags=dynamic
  * @param source cast=(GtkIconSource *)
  * @param pixbuf cast=(GdkPixbuf *)
  */