# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1088268113 0
# Node ID 7b48e7c07bcff7e457ac8a82d55e222c7c22707d
# Parent  01fe2254c5706632763d8359ef349a2534b68a49
[gaim-migrate @ 10219]
Support for the Epiphany web browser.  This one seems silly to me.
Like, people should just use gnome-default or something.  Eh.

committer: Tailor Script <tailor@pidgin.im>

diff -r 01fe2254c570 -r 7b48e7c07bcf COPYRIGHT
--- a/COPYRIGHT	Sat Jun 26 16:40:32 2004 +0000
+++ b/COPYRIGHT	Sat Jun 26 16:41:53 2004 +0000
@@ -122,6 +122,7 @@
 Evan Schoenberg
 Torrey Searle
 Don Seiler
+Leonardo Serra
 Jim Seymour
 Joe Shaw
 John Silvestri
diff -r 01fe2254c570 -r 7b48e7c07bcf ChangeLog
--- a/ChangeLog	Sat Jun 26 16:40:32 2004 +0000
+++ b/ChangeLog	Sat Jun 26 16:41:53 2004 +0000
@@ -1,6 +1,9 @@
 Gaim: The Pimpin' Penguin IM Client that's good for the soul!
 
 version 0.80cvs:
+	New Features:
+	* Support for the Epiphany web browser (Leonardo Serra)
+
 	Bug Fixes:
 	* The firefox browser option now works with firefox 0.9
 
diff -r 01fe2254c570 -r 7b48e7c07bcf src/gtknotify.c
--- a/src/gtknotify.c	Sat Jun 26 16:40:32 2004 +0000
+++ b/src/gtknotify.c	Sat Jun 26 16:41:53 2004 +0000
@@ -481,37 +481,19 @@
 	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");
 	place = gaim_prefs_get_int("/gaim/gtk/browsers/place");
 
-	if (!strcmp(web_browser, "netscape"))
-	{
-		command = g_strdup_printf("netscape \"%s\"", uri);
-
-		if (place == GAIM_BROWSER_NEW_WINDOW)
-		{
-			remote_command = g_strdup_printf("netscape -remote "
-											 "\"openURL(\"%s\",new-window)\"",
-											 uri);
-		}
-		else if (place == GAIM_BROWSER_CURRENT)
-		{
-			remote_command = g_strdup_printf("netscape -remote "
-											 "\"openURL(\"%s\")\"", uri);
-		}
-	}
-	else if (!strcmp(web_browser, "opera"))
+	if (!strcmp(web_browser, "epiphany") ||
+		!strcmp(web_browser, "galeon"))
 	{
 		if (place == GAIM_BROWSER_NEW_WINDOW)
-			command = g_strdup_printf("opera -newwindow \"%s\"", uri);
+			command = g_strdup_printf("%s -w \"%s\"", web_browser, uri);
 		else if (place == GAIM_BROWSER_NEW_TAB)
-			command = g_strdup_printf("opera -newpage \"%s\"", uri);
-		else if (place == GAIM_BROWSER_CURRENT)
-		{
-			remote_command = g_strdup_printf("opera -remote "
-											 "\"openURL(\"%s\")\"", uri);
-			command = g_strdup_printf("opera \"%s\"", uri);
-		}
+			command = g_strdup_printf("%s -n \"%s\"", web_browser, uri);
 		else
-			command = g_strdup_printf("opera \"%s\"", uri);
-
+			command = g_strdup_printf("%s \"%s\"", web_browser, uri);
+	}
+	else if (!strcmp(web_browser, "gnome-open"))
+	{
+		command = g_strdup_printf("gnome-open \"%s\"", uri);
 	}
 	else if (!strcmp(web_browser, "kfmclient"))
 	{
@@ -521,19 +503,6 @@
 		 * and/or current window?
 		 */
 	}
-	else if (!strcmp(web_browser, "gnome-open"))
-	{
-		command = g_strdup_printf("gnome-open \"%s\"", uri);
-	}
-	else if (!strcmp(web_browser, "galeon"))
-	{
-		if (place == GAIM_BROWSER_NEW_WINDOW)
-			command = g_strdup_printf("galeon -w \"%s\"", uri);
-		else if (place == GAIM_BROWSER_NEW_TAB)
-			command = g_strdup_printf("galeon -n \"%s\"", uri);
-		else
-			command = g_strdup_printf("galeon \"%s\"", uri);
-	}
 	else if (!strcmp(web_browser, "mozilla") ||
 			 !strcmp(web_browser, "mozilla-firebird") ||
 			 !strcmp(web_browser, "firefox"))
@@ -567,6 +536,38 @@
 											 "\"openURL(\"%s\")\"",
 											 web_browser, args, uri);
 	}
+	else if (!strcmp(web_browser, "netscape"))
+	{
+		command = g_strdup_printf("netscape \"%s\"", uri);
+
+		if (place == GAIM_BROWSER_NEW_WINDOW)
+		{
+			remote_command = g_strdup_printf("netscape -remote "
+											 "\"openURL(\"%s\",new-window)\"",
+											 uri);
+		}
+		else if (place == GAIM_BROWSER_CURRENT)
+		{
+			remote_command = g_strdup_printf("netscape -remote "
+											 "\"openURL(\"%s\")\"", uri);
+		}
+	}
+	else if (!strcmp(web_browser, "opera"))
+	{
+		if (place == GAIM_BROWSER_NEW_WINDOW)
+			command = g_strdup_printf("opera -newwindow \"%s\"", uri);
+		else if (place == GAIM_BROWSER_NEW_TAB)
+			command = g_strdup_printf("opera -newpage \"%s\"", uri);
+		else if (place == GAIM_BROWSER_CURRENT)
+		{
+			remote_command = g_strdup_printf("opera -remote "
+											 "\"openURL(\"%s\")\"", uri);
+			command = g_strdup_printf("opera \"%s\"", uri);
+		}
+		else
+			command = g_strdup_printf("opera \"%s\"", uri);
+
+	}
 	else if (!strcmp(web_browser, "custom"))
 	{
 		const char *web_command;
diff -r 01fe2254c570 -r 7b48e7c07bcf src/gtkprefs.c
--- a/src/gtkprefs.c	Sat Jun 26 16:40:32 2004 +0000
+++ b/src/gtkprefs.c	Sat Jun 26 16:41:53 2004 +0000
@@ -1250,16 +1250,17 @@
 	};
 
 	static struct browser possible_browsers[] = {
-		{N_("Opera"), "opera"},
-		{N_("Netscape"), "netscape"},
-		{N_("Mozilla"), "mozilla"},
-		{N_("Konqueror"), "kfmclient"},
-		{N_("Galeon"), "galeon"},
+		{N_("Epiphany"), "epiphany"},
 		{N_("Firebird"), "mozilla-firebird"},
 		{N_("Firefox"), "firefox"},
-		{N_("Gnome Default"), "gnome-open"}
+		{N_("Galeon"), "galeon"},
+		{N_("Gnome Default"), "gnome-open"},
+		{N_("Konqueror"), "kfmclient"},
+		{N_("Mozilla"), "mozilla"},
+		{N_("Netscape"), "netscape"},
+		{N_("Opera"), "opera"}
 	};
-	static const int num_possible_browsers = 8;
+	static const int num_possible_browsers = 9;
 
 	GList *browsers = NULL;
 	int i = 0;