changeset 14647:18b74ed00850

[gaim-migrate @ 17393] Hide the Browsers preference tab when running in OS X, as is done with gnome, and use its open command which functions as gnome-open does for handling clicked links. committer: Tailor Script <tailor@pidgin.im>
author Evan Schoenberg <evan.s@dreskin.net>
date Fri, 29 Sep 2006 00:17:58 +0000
parents e0a93e6fa98b
children 74b69a11830c
files gtk/gtknotify.c gtk/gtkprefs.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/gtknotify.c	Fri Sep 29 00:17:18 2006 +0000
+++ b/gtk/gtknotify.c	Fri Sep 29 00:17:58 2006 +0000
@@ -942,6 +942,10 @@
 	{
 		command = g_strdup_printf("gnome-open %s", escaped);
 	}
+	else if (gaim_running_osx() == TRUE)
+	{
+		command = g_strdup_printf("open %s", escaped);
+	}
 	else if (!strcmp(web_browser, "epiphany") ||
 		!strcmp(web_browser, "galeon"))
 	{
--- a/gtk/gtkprefs.c	Fri Sep 29 00:17:18 2006 +0000
+++ b/gtk/gtkprefs.c	Fri Sep 29 00:17:58 2006 +0000
@@ -1887,8 +1887,8 @@
 	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) {
+	/* if the user is running gnome 2.x or Mac OS X, hide the browsers tab */
+	if ((gaim_running_gnome() == FALSE) && (gaim_running_osx() == FALSE)) {
 		prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
 	}
 #endif