# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1258332863 0
# Node ID 02556824428d09f9c102201ae6892eba6fc6751e
# Parent  a75d14a474d54d86ff3d9b6827e32cf353d1caf3
Oops.  If the user was running GNOME, he/she wouldn't see the proxy and browser
tabs, so the blurbs I just moved wouldn't be visible.

diff -r a75d14a474d5 -r 02556824428d pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Mon Nov 16 00:52:45 2009 +0000
+++ b/pidgin/gtkprefs.c	Mon Nov 16 00:54:23 2009 +0000
@@ -2873,16 +2873,15 @@
 
 #ifndef _WIN32
 	/* We use the registered default browser in windows */
-	/* if the user is running gnome 2.x or Mac OS X, hide the browsers tab */
-	if((purple_running_gnome() == FALSE) && (purple_running_osx() == FALSE))
+	/* if the user is running Mac OS X, hide the browsers tab */
+	if(purple_running_osx() == FALSE)
 		prefs_notebook_add_page(_("Browser"), browser_page(), notebook_page++);
 #endif
 
 	prefs_notebook_add_page(_("Conversations"), conv_page(), notebook_page++);
 	prefs_notebook_add_page(_("Logging"), logging_page(), notebook_page++);
 	prefs_notebook_add_page(_("Network"), network_page(), notebook_page++);
-	if(purple_running_gnome() == FALSE)
-		prefs_notebook_add_page(_("Proxy"), proxy_page(), notebook_page++);
+	prefs_notebook_add_page(_("Proxy"), proxy_page(), notebook_page++);
 
 	prefs_notebook_add_page(_("Sounds"), sound_page(), notebook_page++);
 	prefs_notebook_add_page(_("Status / Idle"), away_page(), notebook_page++);