--- old/src/solaris/native/sun/awt/gtk2_interface.c	Wed Feb  1 19:35:49 2012
+++ new/src/solaris/native/sun/awt/gtk2_interface.c	Wed Feb  1 19:35:48 2012
@@ -432,6 +432,20 @@
 }
 
 /**
+ * Functions for awt_Desktop.c
+ */
+gboolean gtk2_show_uri_load() {
+        dlerror();
+        fp_gtk_show_uri = dl_symbol("gtk_show_uri");
+	const char *dlsym_error = dlerror();
+        if (dlsym_error) {
+            fprintf (stderr, "Cannot load symbol: %s \n", dlsym_error);
+            return 0;
+        }
+        return 1;
+}
+
+/**
  * Functions for sun_awt_X11_GtkFileDialogPeer.c
  */
 void gtk2_file_chooser_load()
--- old/src/solaris/native/sun/awt/gtk2_interface.h	Wed Feb  1 19:35:51 2012
+++ new/src/solaris/native/sun/awt/gtk2_interface.h	Wed Feb  1 19:35:51 2012
@@ -42,6 +42,7 @@
 #define GTK_STOCK_CANCEL           "gtk-cancel"
 #define GTK_STOCK_SAVE             "gtk-save"
 #define GTK_STOCK_OPEN             "gtk-open"
+#define GDK_CURRENT_TIME           0L
 
 typedef enum _WidgetType
 {
@@ -279,6 +280,7 @@
 
 typedef void GdkColormap;
 typedef void GdkDrawable;
+typedef void GdkScreen;
 typedef void GdkGC;
 typedef void GdkPixbuf;
 typedef void GdkPixmap;
@@ -795,4 +797,7 @@
 void (*fp_gdk_threads_enter)(void);
 void (*fp_gdk_threads_leave)(void);
 
+gboolean (*fp_gtk_show_uri)(GdkScreen *screen, const gchar *uri,
+        guint32 timestamp, GError **error);
+
 #endif /* !_GTK2_INTERFACE_H */
--- old/src/solaris/native/sun/xawt/awt_Desktop.c	Wed Feb  1 19:35:53 2012
+++ new/src/solaris/native/sun/xawt/awt_Desktop.c	Wed Feb  1 19:35:53 2012
@@ -24,62 +24,13 @@
  */
 
 #include <jni.h>
-#include <dlfcn.h>
+#include "gtk2_interface.h"
 
-typedef int gboolean;
-
-typedef gboolean (GNOME_URL_SHOW_TYPE)(const char *, void **);
-typedef gboolean (GNOME_VFS_INIT_TYPE)(void);
-
-GNOME_URL_SHOW_TYPE *gnome_url_show;
-GNOME_VFS_INIT_TYPE *gnome_vfs_init;
-
 int init(){
-    void *vfs_handle;
-    void *gnome_handle;
-    const char *errmsg;
-
-    vfs_handle = dlopen("libgnomevfs-2.so.0", RTLD_LAZY);
-    if (vfs_handle == NULL) {
-#ifdef INTERNAL_BUILD
-        fprintf(stderr, "can not load libgnomevfs-2.so\n");
-#endif
-        return 0;
-    }
-    dlerror(); /* Clear errors */
-    gnome_vfs_init = (GNOME_VFS_INIT_TYPE*)dlsym(vfs_handle, "gnome_vfs_init");
-    if (gnome_vfs_init == NULL){
-#ifdef INTERNAL_BUILD
-        fprintf(stderr, "dlsym( gnome_vfs_init) returned NULL\n");
-#endif
-        return 0;
-    }
-    if ((errmsg = dlerror()) != NULL) {
-#ifdef INTERNAL_BUILD
-        fprintf(stderr, "can not find symbol gnome_vfs_init %s \n", errmsg);
-#endif
-        return 0;
-    }
-    // call gonme_vfs_init()
-    (*gnome_vfs_init)();
-
-    gnome_handle = dlopen("libgnome-2.so.0", RTLD_LAZY);
-    if (gnome_handle == NULL) {
-#ifdef INTERNAL_BUILD
-        fprintf(stderr, "can not load libgnome-2.so\n");
-#endif
-        return 0;
-    }
-    dlerror(); /* Clear errors */
-    gnome_url_show = (GNOME_URL_SHOW_TYPE*)dlsym(gnome_handle, "gnome_url_show");
-    if ((errmsg = dlerror()) != NULL) {
-#ifdef INTERNAL_BUILD
-        fprintf(stderr, "can not find symble gnome_url_show\n");
-#endif
-        return 0;
-    }
-
-    return 1;
+    if (gtk2_load() && gtk2_show_uri_load()) {
+        return 1;
+    } 
+    return 0;
 }
 
 /*
@@ -103,15 +54,16 @@
   (JNIEnv *env, jobject obj, jbyteArray url_j)
 {
     gboolean success;
-    const char* url_c;
+    const gchar* url_c;
 
-    if (gnome_url_show == NULL) {
-        return JNI_FALSE;
-    }
-
     url_c = (char*)(*env)->GetByteArrayElements(env, url_j, NULL);
-    // call gnome_url_show(const char* , GError**)
-    success = (*gnome_url_show)(url_c, NULL);
+
+    fp_gdk_threads_enter();
+
+    success = fp_gtk_show_uri(NULL, url_c, GDK_CURRENT_TIME, NULL);
+
+    fp_gdk_threads_leave();
+
     (*env)->ReleaseByteArrayElements(env, url_j, (signed char*)url_c, 0);
 
     return success ? JNI_TRUE : JNI_FALSE;