diff src/browser.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 <[e-mail]>

--- a/src/browser.c	Tue Sep 16 04:49:51 2003 +0000
+++ b/src/browser.c	Tue Sep 16 04:57:36 2003 +0000
@@ -567,11 +567,9 @@
 		web_command = gaim_prefs_get_string("/gaim/gtk/browsers/command");
 
 		if (web_command == NULL || *web_command == '\0') {
-			gaim_notify_error(NULL, NULL,
-							  _("Unable to launch your browser because "
-								"the 'Manual' browser command has been "
-								"chosen, but no command has been set."),
-							  NULL);
+			gaim_notify_error(NULL, NULL, _("Unable to open URL"),
+							  _("The 'Manual' browser command has been "
+								"chosen, but no command has been set."));
 			return NULL;
 		}
 
@@ -586,12 +584,18 @@
 		}
 	}
 
-	if (!g_spawn_command_line_async(command, &error)) {
+	if (!program_is_valid(command)) {
+		gchar *tmp = g_strdup_printf(_("The browser \"%s\" is invalid."), 
+						command);
+		gaim_notify_error(NULL, NULL, _("Unable to open URL"), tmp);
+		g_free(tmp);
+
+	} else if (!g_spawn_command_line_async(command, &error)) {
 		char *tmp = g_strdup_printf(
-				_("There was an error launching your chosen browser: %s"),
+				_("Error launching \"command\": %s"),
 				error->message);
 
-		gaim_notify_error(NULL, NULL, tmp, NULL);
+		gaim_notify_error(NULL, NULL, _("Unable to open URL"), tmp);
 
 		g_free(tmp);
 		g_error_free(error);