Revert string changes and add entries for Firefox on Debian and Fedora

2004-10-14  Kjartan Maraas  <kmaraas@gnome.org>

	* gnome-default-applications-properties-structs.c: Revert string
	changes and add entries for Firefox on Debian and Fedora with
	new binary names. Original patch from jdassen at debian org.
	Closes part of bug #155246. The original patch should go into HEAD
	after branching.
	* gnome-default-applications-properties.c: (browser_setup_custom),
	(mailer_setup_custom), (terminal_setup_custom): Use the binary
	that's found in the path. Patch by seb128 at debian org. Closes
	bug #148991.

3 files changed, 19 insertions, 8 deletions

diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index c0d71547b..bbb7ccf58 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,15 @@
+2004-10-14  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gnome-default-applications-properties-structs.c: Revert string
+	changes and add entries for Firefox on Debian and Fedora with
+	new binary names. Original patch from jdassen at debian org.
+	Closes part of bug #155246. The original patch should go into HEAD
+	after branching.
+	* gnome-default-applications-properties.c: (browser_setup_custom),
+	(mailer_setup_custom), (terminal_setup_custom): Use the binary
+	that's found in the path. Patch by seb128 at debian org. Closes
+	bug #148991.
+
 2004-10-12  J.H.M. Dassen (Ray) <jdassen@debian.org>
 
 	* gnome-default-applications-properties-structs.c: Added Mozilla
diff --git a/capplets/default-applications/gnome-default-applications-properties-structs.c b/capplets/default-applications/gnome-default-applications-properties-structs.c
index 06374424e..34ff31cea 100644
--- a/capplets/default-applications/gnome-default-applications-properties-structs.c
+++ b/capplets/default-applications/gnome-default-applications-properties-structs.c
@@ -6,17 +6,17 @@ struct _BrowserDescription {
 	gboolean in_path;
 };
 BrowserDescription possible_browsers[] = {
-        { N_("Debian Sensible Browser"),	"sensible-browser",	"sensible-browser %s",	FALSE, FALSE },
         { N_("Epiphany"), 		"epiphany",	"epiphany %s",		FALSE, FALSE },
         { N_("Galeon"), 		"galeon",	"galeon %s",		FALSE, FALSE },
         { N_("Encompass"), 		"encompass",	"encompass %s",		FALSE, FALSE },
-        { N_("FireFox"),  "mozilla-firefox",	"mozilla-firefox %s",	FALSE, FALSE },
-        { N_("Firebird/FireFox"),  "mozilla-firebird",	"mozilla-firebird %s",	FALSE, FALSE },
+        { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
+        { N_("Firebird/FireFox"),  "mozilla-firefox",	"mozilla-firebird %s",  FALSE, FALSE },
+        { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firebird %s",	FALSE, FALSE },
         { N_("Mozilla/Netscape 6"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
         { N_("Mozilla/Netscape 6"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
         { N_("Netscape Communicator"), 	"netscape",	"netscape %s",		FALSE, FALSE },
         { N_("Konqueror"), 		"konqueror",	"konqueror %s",		FALSE, FALSE },
-        { N_("W3M Text Browser"),	"w3m",		"w3m %s",		TRUE,  FALSE },
+        { N_("W3M Text Browser"),	"w3n",		"w3m %s",		TRUE,  FALSE },
         { N_("Lynx Text Browser"),	"lynx",		"lynx %s",		TRUE,  FALSE },
         { N_("Links Text Browser") , 	"links",	"links %s",		TRUE,  FALSE }
 };
@@ -51,7 +51,6 @@ struct _TerminalDesciption {
 	gboolean in_path;
 };
 TerminalDescription possible_terminals[] = { 
-        { N_("Debian Terminal Emulator"),	"x-terminal-emulator",	"-e", FALSE },
         { N_("Gnome Terminal"),		"gnome-terminal",	"-x", FALSE },
         { N_("Standard XTerminal"),	"xterm",		"-e", FALSE },
         { N_("NXterm"),			"nxterm",		"-e", FALSE },
diff --git a/capplets/default-applications/gnome-default-applications-properties.c b/capplets/default-applications/gnome-default-applications-properties.c
index 0018fabff..256b23186 100644
--- a/capplets/default-applications/gnome-default-applications-properties.c
+++ b/capplets/default-applications/gnome-default-applications-properties.c
@@ -458,7 +458,7 @@ browser_setup_custom (GtkWidget *entry,
 	const gchar *browser = gtk_entry_get_text (GTK_ENTRY (entry));
 
 	for (i = 0; i < G_N_ELEMENTS (possible_browsers); i++ ) {
-		if (! strcmp (_(possible_browsers[i].name), browser)) {
+		if (! strcmp (_(possible_browsers[i].name), browser) && possible_browsers[i].in_path) {
 		        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_custom_terminal_toggle")),
 						      possible_browsers[i].needs_term);
 			gtk_entry_set_text (GTK_ENTRY (WID ("web_custom_command_entry")),
@@ -476,7 +476,7 @@ mailer_setup_custom (GtkWidget *entry,
 	const gchar *mailer = gtk_entry_get_text (GTK_ENTRY (entry));
 
 	for (i = 0; i < G_N_ELEMENTS (possible_mailers); i++ ) {
-		if (! strcmp (_(possible_mailers[i].name), mailer)) {
+		if (! strcmp (_(possible_mailers[i].name), mailer) && possible_mailers[i].in_path) {
 		        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("mail_custom_terminal_toggle")),
 						      possible_mailers[i].needs_term);
 			gtk_entry_set_text (GTK_ENTRY (WID ("mail_custom_command_entry")),
@@ -537,7 +537,7 @@ terminal_setup_custom (GtkWidget *entry,
 	const gchar *terminal = gtk_entry_get_text (GTK_ENTRY (entry));
 
 	for (i = 0; i < G_N_ELEMENTS (possible_terminals); i++ ) {
-		if (! strcmp (_(possible_terminals[i].name), terminal)) {
+		if (! strcmp (_(possible_terminals[i].name), terminal) && possible_terminals[i].in_path) {
 			gtk_entry_set_text (GTK_ENTRY (WID ("terminal_custom_command_entry")), possible_terminals[i].exec);
 			gtk_entry_set_text (GTK_ENTRY (WID ("terminal_custom_exec_entry")), possible_terminals[i].exec_arg);
 			return;