Mercurial > pidgin
diff src/gtkprefs.c @ 6861:4ae5d9c3d9ec
[gaim-migrate @ 7407]
You know the thing that checked if the manual browser command was valid?
I moved the funcion that does the actual checking into util.c It's pretty
generic, I guess.
I moved the check (the call to that function) to browser.c, so it checks
for a valid browser when you click on a link. The old way used to really
annoy me, because you would get multiple error boxes about the browser
being invalid.
Herman, I tried to keep things compiling on Windows. I didn't want to
#ifdef the program_is_valid() function in util.c--I don't see any
reason why it wouldn't compile in Windows. But if there's a problem
with it feel free to #ifdef that puppy.
Also, Nathan, I'm going to quiz you later on my townhousemates, so
please bring a number two pencil and make sure you eat a healthy breakfast.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 16 Sep 2003 04:57:36 +0000 |
parents | fac483a95584 |
children | 6ed0a1c045b4 |
line wrap: on
line diff
--- a/src/gtkprefs.c Tue Sep 16 04:49:51 2003 +0000 +++ b/src/gtkprefs.c Tue Sep 16 04:57:36 2003 +0000 @@ -101,10 +101,6 @@ static void delete_prefs(GtkWidget *, void *); static void update_plugin_list(void *data); -#ifndef _WIN32 -static gboolean program_is_valid(const char *); -#endif - void set_default_away(GtkWidget *, gpointer); static void @@ -1204,48 +1200,9 @@ } #ifndef _WIN32 -static gboolean program_is_valid(const char *program) -{ - GError *error = NULL; - char **argv; - gchar *progname; - gboolean is_valid = FALSE; - - if (program == NULL || *program == '\0') { - return FALSE; - } - - if (!g_shell_parse_argv(program, NULL, &argv, &error)) { - gaim_debug(GAIM_DEBUG_ERROR, "program_is_valid", - "Could not parse program '%s': %s\n", - program, error->message); - g_error_free(error); - return FALSE; - } - - if (argv == NULL) { - return FALSE; - } - - progname = g_find_program_in_path(argv[0]); - is_valid = (progname != NULL); - - g_strfreev(argv); - g_free(progname); - - return is_valid; -} - static gboolean manual_browser_set(GtkWidget *entry, GdkEventFocus *event, gpointer data) { const char *program = gtk_entry_get_text(GTK_ENTRY(entry)); - if (!program_is_valid(program)) { - char *error = g_strdup_printf(_("The entered manual browser " - "'%s' is not valid. Hyperlinks will " - "not work."), program); - gaim_notify_warning(NULL, NULL, error, NULL); - } - gaim_prefs_set_string("/gaim/gtk/browsers/command", program); /* carry on normally */