diff -u -ru gaim-0.82.1-orig/src/gtknotify.c gaim-0.82.1/src/gtknotify.c --- gaim-0.82.1-orig/src/gtknotify.c 2004-08-21 01:12:23.000000000 -0400 +++ gaim-0.82.1/src/gtknotify.c 2004-09-07 10:19:17.808912603 -0400 @@ -466,6 +466,17 @@ } #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,7 +489,12 @@ web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser"); place = gaim_prefs_get_int("/gaim/gtk/browsers/place"); - if (!strcmp(web_browser, "epiphany") || + /* if they are running gnome, use the gnome web browser */ + if (running_gnome() == TRUE) + { + command = g_strdup_printf("gnome-open \"%s\"", uri); + } + else if (!strcmp(web_browser, "epiphany") || !strcmp(web_browser, "galeon")) { if (place == GAIM_BROWSER_NEW_WINDOW) diff -u -ru gaim-0.82.1-orig/src/gtkprefs.c gaim-0.82.1/src/gtkprefs.c --- gaim-0.82.1-orig/src/gtkprefs.c 2004-08-22 19:10:49.000000000 -0400 +++ gaim-0.82.1/src/gtkprefs.c 2004-09-07 10:20:21.430873562 -0400 @@ -2422,7 +2422,10 @@ prefs_notebook_add_page(_("Network"), NULL, network_page(), &p, NULL, notebook_page++); #ifndef _WIN32 /* We use the registered default browser in windows */ - prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++); + /* if the user is running gnome 2.x, hide the browsers tab */ + if (running_gnome() == FALSE) { + 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++);