--- old/src/solaris/native/sun/awt/gtk2_interface.h 2013-09-27 17:37:05.734040481 +0400 +++ new/src/solaris/native/sun/awt/gtk2_interface.h 2013-09-27 17:37:05.526040476 +0400 @@ -643,6 +643,14 @@ */ const char *getStrFor(JNIEnv *env, jstring value); +/** + * Returns : + * NULL if the GLib library is compatible with the given version, or a string + * describing the version mismatch. + */ +gchar* (*fp_glib_check_version)(guint required_major, guint required_minor, + guint required_micro); + /* * Check whether the gtk2 library is available and meets the minimum * version requirement. If the library is already loaded this method has no @@ -663,7 +671,7 @@ * effect and returns success. * Returns FALSE on failure and TRUE on success. */ -gboolean gtk2_load(); +gboolean gtk2_load(JNIEnv *env); /* * Loads fp_gtk_show_uri function pointer. This initialization is @@ -801,6 +809,12 @@ guint (*fp_gtk_main_level)(void); +/** + * This function is available for GLIB > 2.20, so it MUST be + * called within (fp_glib_check_version(2, 20, 0) == NULL) check. + */ +gboolean (*fp_g_thread_get_initialized)(void); + void (*fp_g_thread_init)(GThreadFunctions *vtable); void (*fp_gdk_threads_init)(void); void (*fp_gdk_threads_enter)(void);