diff -u -r /tmp/gaim-0.66/src/browser.c /usr/local/gnome2-build/gaim-0.66/src/browser.c --- /tmp/gaim-0.66/src/browser.c 2003-07-02 23:06:17.000000000 -0400 +++ /usr/local/gnome2-build/gaim-0.66/src/browser.c 2003-07-29 12:20:31.000000000 -0400 @@ -513,6 +513,14 @@ return TRUE; } +gboolean running_gnome(void) +{ + if( g_getenv ("GNOME_DESKTOP_SESSION_ID") && g_find_program_in_path("gnome-open") != NULL) { + return TRUE; + } + return FALSE; +} + void open_url(GtkWidget *w, const char *url) { char *command = NULL; @@ -521,7 +529,11 @@ web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser"); - if (!strcmp(web_browser, "netscape")) { + /* if they are running gnome, use the gnome web browser */ + if(running_gnome() == TRUE) { + command = g_strdup_printf("gnome-open \"%s\"", url); + } + else if (!strcmp(web_browser, "netscape")) { char *args = NULL; if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window")) diff -u -r /tmp/gaim-0.66/src/gtkprefs.c /usr/local/gnome2-build/gaim-0.66/src/gtkprefs.c --- /tmp/gaim-0.66/src/gtkprefs.c 2003-07-18 10:16:31.000000000 -0400 +++ /usr/local/gnome2-build/gaim-0.66/src/gtkprefs.c 2003-07-29 12:20:54.000000000 -0400 @@ -1257,7 +1257,7 @@ {N_("Netscape"), "netscape"}, {N_("Mozilla"), "mozilla"}, {N_("Konqueror"), "kfmclient"}, - {N_("Galeon"), "galeon"} + {N_("Galeon"), "galeon"}, }; static const int num_possible_browsers = 5; @@ -2293,7 +2293,10 @@ prefs_notebook_add_page(_("Proxy"), NULL, proxy_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(_("Sounds"), NULL, sound_page(), &p, NULL, notebook_page++); diff -u -r /tmp/gaim-0.66/src/ui.h /usr/local/gnome2-build/gaim-0.66/src/ui.h --- /tmp/gaim-0.66/src/ui.h 2003-07-18 10:03:20.000000000 -0400 +++ /usr/local/gnome2-build/gaim-0.66/src/ui.h 2003-07-29 12:14:25.000000000 -0400 @@ -188,6 +188,8 @@ /* Functions in browser.c */ extern void open_url(GtkWidget *, const char *); extern void add_bookmark(GtkWidget *, char *); +extern gboolean running_gnome(void); + /* Functions in dialogs.c */ extern void alias_dialog_bud(struct buddy *);