Unique-ify the lists so that we can handle multiple excutable names for

2004-02-13  Jody Goldberg <jody@gnome.org>

	* gnome-default-applications-properties.c : Unique-ify the lists so
	  that we can handle multiple excutable names for the same browser
	  when the list jumps to gconf.  Remove the vile hack specifict to
	  evolution.

	* gnome-default-applications-properties-structs.c (};) : remove the
	  nremote flag and add a few new browsers.
This commit is contained in:
Jody Goldberg 2004-02-13 14:29:30 +00:00 committed by Jody Goldberg
parent ff003126bb
commit ed7b26ff46
3 changed files with 101 additions and 114 deletions

View file

@ -1,71 +1,55 @@
struct _BrowserDescription
{
gchar *name;
gchar *executable_name;
gchar *command;
gboolean needs_term;
gboolean nremote;
gboolean in_path;
};
struct _MailerDescription
{
gchar *name;
gchar *executable_name;
gchar *command;
struct _BrowserDescription {
gchar const *name;
gchar const *executable_name;
gchar const *command;
gboolean needs_term;
gboolean in_path;
};
BrowserDescription possible_browsers[] = {
{ N_("Epiphany"), "epiphany", "epiphany %s", FALSE, FALSE },
{ N_("Galeon"), "galeon", "galeon %s", FALSE, FALSE },
{ N_("Encompass"), "encompass", "encompass %s", FALSE, FALSE },
{ N_("Firebird/FireFox"), "mozilla-firebird", "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"), "w3n", "w3m %s", TRUE, FALSE },
{ N_("Lynx Text Browser"), "lynx", "lynx %s", TRUE, FALSE },
{ N_("Links Text Browser") , "links", "links %s", TRUE, FALSE }
};
struct _HelpViewDescription
{
gchar *name;
gchar *executable_name;
struct _MailerDescription {
gchar const *name;
gchar const *executable_name;
gchar const *command;
gboolean needs_term;
gboolean accepts_urls;
gboolean in_path;
};
struct _TerminalDesciption
{
gchar *name;
gchar *exec;
gchar *exec_arg;
gboolean in_path;
};
BrowserDescription possible_browsers[] =
{
{ N_("Epiphany"), "epiphany", "epiphany %s", FALSE, FALSE, FALSE },
{ N_("Galeon"), "galeon", "galeon %s", FALSE, FALSE, FALSE },
{ N_("Encompass"), "encompass", "encompass %s", FALSE, FALSE, FALSE },
{ N_("Mozilla/Netscape 6"), "mozilla", "mozilla %s", FALSE, TRUE, FALSE },
{ N_("Netscape Communicator"), "netscape", "netscape %s", FALSE, TRUE, FALSE },
{ N_("Konqueror"), "konqueror", "konqueror %s", FALSE, FALSE, FALSE },
{ N_("Lynx Text Browser"), "lynx", "lynx %s", TRUE, FALSE, FALSE },
{ N_("Links Text Browser") , "links", "links %s", TRUE, FALSE, FALSE }
};
MailerDescription possible_mailers[] =
{
MailerDescription possible_mailers[] = {
/* The code in gnome-default-applications-properties.c makes sure
* there is only one (the first entry in this list) Evolution entry
* in the list shown to the user
*/
{ N_("Evolution Mail Reader"), "evolution-1.4", "evolution-1.4 %s", FALSE, FALSE, },
{ N_("Evolution Mail Reader"), "evolution", "evolution %s", FALSE, FALSE, },
{ N_("Balsa"), "balsa", "balsa --compose=%s", FALSE, FALSE },
{ N_("KMail"), "kmail", "kmail %s", FALSE, FALSE },
{ N_("Mozilla Mail"), "mozilla", "mozilla -mail %s", FALSE, FALSE},
{ N_("Mutt") , "mutt", "mutt %s", TRUE, FALSE },
{ N_("Evolution Mail Reader"), "evolution-1.4", "evolution-1.4 %s", FALSE, FALSE, },
{ N_("Evolution Mail Reader"), "evolution", "evolution %s", FALSE, FALSE, },
{ N_("Balsa"), "balsa", "balsa --compose=%s", FALSE, FALSE },
{ N_("KMail"), "kmail", "kmail %s", FALSE, FALSE },
{ N_("Mozilla Mail"), "mozilla", "mozilla -mail %s", FALSE, FALSE},
{ N_("Mutt") , "mutt", "mutt %s", TRUE, FALSE },
};
TerminalDescription possible_terminals[] =
{
{ N_("Gnome Terminal"), "gnome-terminal", "-x", FALSE },
{ N_("Standard XTerminal"), "xterm", "-e", FALSE },
{ N_("NXterm"), "nxterm", "-e", FALSE },
{ N_("RXVT"), "rxvt", "-e", FALSE },
{ N_("ETerm"), "Eterm", "-e", FALSE }
struct _TerminalDesciption {
gchar const *name;
gchar const *exec;
gchar const *exec_arg;
gboolean in_path;
};
TerminalDescription possible_terminals[] = {
{ N_("Gnome Terminal"), "gnome-terminal", "-x", FALSE },
{ N_("Standard XTerminal"), "xterm", "-e", FALSE },
{ N_("NXterm"), "nxterm", "-e", FALSE },
{ N_("RXVT"), "rxvt", "-e", FALSE },
{ N_("ETerm"), "Eterm", "-e", FALSE }
};