Index: src/gtknotify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtknotify.c,v
retrieving revision 1.68
diff -u -p -r1.68 gtknotify.c
--- src/gtknotify.c	23 Sep 2004 13:45:48 -0000	1.68
+++ src/gtknotify.c	5 Nov 2004 02:46:20 -0000
@@ -466,6 +466,17 @@ uri_command(const char *command, gboolea
 }
 #endif /* _WIN32 */
 
+gboolean 
+running_gnome(void)
+{
+	if (g_getenv("GNOME_DESKTOP_SESSION_ID") && g_find_program_in_path("gnome-open") != NULL)
+	{
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void *
 gaim_gtk_notify_uri(const char *uri)
 {
@@ -478,12 +489,7 @@ gaim_gtk_notify_uri(const char *uri)
 	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");
 	place = gaim_prefs_get_int("/gaim/gtk/browsers/place");
 
-	/* if they are running gnome, use the gnome web browser */
-	if (gaim_running_gnome() == TRUE)
-	{
-		command = g_strdup_printf("gnome-open \"%s\"", uri);
-	}
-	else if (!strcmp(web_browser, "epiphany") ||
+	if (!strcmp(web_browser, "epiphany") ||
 		!strcmp(web_browser, "galeon"))
 	{
 		if (place == GAIM_BROWSER_NEW_WINDOW)
Index: src/gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.221
diff -u -p -r1.221 gtkprefs.c
--- src/gtkprefs.c	23 Oct 2004 16:02:49 -0000	1.221
+++ src/gtkprefs.c	5 Nov 2004 02:46:21 -0000
@@ -2204,10 +2204,7 @@ void prefs_notebook_init() {
 	prefs_notebook_add_page(_("Network"), NULL, network_page(), &p, NULL, notebook_page++);
 #ifndef _WIN32
 	/* We use the registered default browser in windows */
-	/* if the user is running gnome 2.x, hide the browsers tab */
-	if (gaim_running_gnome() == FALSE) {
-		prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
-	}
+	prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
 #endif
 	prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++);
 	prefs_notebook_add_page(_("Away / Idle"), NULL, away_page(), &p, NULL, notebook_page++);