diff -Nur network-manager-applet-0.6.5/configure.ac network-manager-applet-0.6.5.new/configure.ac
--- network-manager-applet-0.6.5/configure.ac	2007-09-02 00:17:06.000000000 +0200
+++ network-manager-applet-0.6.5.new/configure.ac	2007-09-02 00:17:34.000000000 +0200
@@ -151,15 +151,12 @@
 fi
 AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
 
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+LIBGNOMEUI_CFLAGS=
+LIBGNOMEUI_LIBS=
+
 AC_SUBST(LIBGNOMEUI_CFLAGS)
 AC_SUBST(LIBGNOMEUI_LIBS)
 
-PKG_CHECK_EXISTS([libgnome-2.0 >= 2.14.0],[have_libgnome_2_14=yes],[have_libgnome_2_14=no])
-if test "$have_libgnome_2_14" = "yes"; then
-	AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14])
-fi
-
 AC_MSG_CHECKING([for wireless-tools >= 28pre9])
 AC_TRY_COMPILE([#include <iwlib.h>],
                [#ifndef IWEVGENIE
diff -Nur network-manager-applet-0.6.5/src/applet.c network-manager-applet-0.6.5.new/src/applet.c
--- network-manager-applet-0.6.5/src/applet.c	2007-09-02 00:17:33.000000000 +0200
+++ network-manager-applet-0.6.5.new/src/applet.c	2007-09-02 00:17:48.000000000 +0200
@@ -31,10 +31,10 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomeui/libgnomeui.h>
 
 #if !GTK_CHECK_VERSION(2,6,0)
 #include <gnome.h>
@@ -290,7 +290,34 @@
                                            const gchar *url,
                                            gpointer data)
 {
-	gnome_url_show (url, NULL);
+	GError *error = NULL;
+	gboolean ret;
+	char *cmdline;
+	GdkScreen *gscreen;
+	GtkWidget *error_dialog;
+
+	gscreen = gdk_screen_get_default();
+
+	cmdline = g_strconcat ("gnome-open ", url, NULL);
+	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
+	g_free (cmdline);
+
+	if (ret == TRUE)
+		return;
+
+	g_error_free (error);
+	error = NULL;
+
+	cmdline = g_strconcat ("xdg-open ", url, NULL);
+	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
+	g_free (cmdline);
+	
+	if (ret == FALSE) {
+		error_dialog = gtk_message_dialog_new ( NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Failed to show url %s", error->message); 
+		gtk_dialog_run (GTK_DIALOG (error_dialog));
+		g_error_free (error);
+	}
+
 }
 
 static void nma_about_cb (GtkMenuItem *mi, NMApplet *applet)
diff -Nur network-manager-applet-0.6.5/src/main.c network-manager-applet-0.6.5.new/src/main.c
--- network-manager-applet-0.6.5/src/main.c	2007-09-02 00:17:06.000000000 +0200
+++ network-manager-applet-0.6.5.new/src/main.c	2007-09-02 00:17:34.000000000 +0200
@@ -25,44 +25,27 @@
 # include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/libgnomeui.h>
 #include <glib/gi18n-lib.h>
 
 #include "applet.h"
 #include "applet-dbus-vpn.h"
 
-static void session_die (GnomeClient *client, gpointer client_data)
-{
-	NMApplet *applet = client_data;
-	nma_dbus_vpn_deactivate_connection (applet->connection);
-	gtk_main_quit ();
-}
-
 int main (int argc, char *argv[])
 {
 	NMApplet *	nma;
-	GnomeClient *	client;
-
-	gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
-			    argc, argv, 
-			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
-
-    	client = gnome_master_client ();
-    	gnome_client_set_restart_style (client, GNOME_RESTART_ANYWAY);
 
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
+	gtk_init (&argc, &argv);
 
 	nma = nma_new ();
 	if (!nma)
 		exit (EXIT_FAILURE);
 
-    	g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL);
-    	g_signal_connect (client, "die", G_CALLBACK (session_die), nma);	
-
 	gtk_widget_show_all (GTK_WIDGET (nma));
 	gtk_main ();