comparison src/browser.c @ 5513:d1524728d491

[gaim-migrate @ 5912] Dario Sarango (darius_wolfson) patched bug 743000 writting: "Summary: scans the manual browser command for multiple %s. If multiple %s are found, error message is given and the web_command is not executed. " committer: Tailor Script <[e-mail]>

5512:e41b04bb4afe

			command = g_strdup_printf("mozilla \"%s\"", url);
			break;

		case BROWSER_MANUAL: {
			char *space_free_url = NULL;

			if (!web_command[0]) {
				gaim_notify_error(NULL, NULL,
								  _("Unable to launch your browser because "
									"the 'Manual' browser command has been "

				return;
			}

			space_free_url = g_strdup(url);
			g_strdelimit(space_free_url, " ", '+');
			if(strstr(web_command, "%s"))
				command = g_strdup_printf(web_command, space_free_url);
			else
				command = g_strdup_printf("%s %s", web_command, space_free_url);
			g_free(space_free_url);
		} break;
	}

	if (g_spawn_command_line_async(command, &error) == FALSE) {
		char *tmp = g_strdup_printf(_("There was an error launching your chosen browser: %s"), error->message);

5513:d1524728d491

			command = g_strdup_printf("mozilla \"%s\"", url);
			break;

		case BROWSER_MANUAL: {
			char *space_free_url = NULL;
			char *web_tmp = NULL;

			if (!web_command[0]) {
				gaim_notify_error(NULL, NULL,
								  _("Unable to launch your browser because "
									"the 'Manual' browser command has been "

				return;
			}

			space_free_url = g_strdup(url);
			g_strdelimit(space_free_url, " ", '+');
			/*
			if (strstr(web_command, "%s"))
				command = g_strdup_printf(web_command, space_free_url);

			Replaced the above with the following to avoid users
			from entering more than one %s as part of the browser
			command.
			*/
			web_tmp = strstr(web_command, "%s");
			if(web_tmp)
			{
				if (strstr((web_tmp + 1), "%s"))
					command = g_strdup_printf(web_command, space_free_url);
				else
					gaim_notify_error(NULL, NULL, _("Unable to launch your browser because the 'Manual' browser command has too many '%s'."), NULL);
			}
			else
				command = g_strdup_printf("%s %s", web_command, space_free_url);
			g_free(space_free_url);
			g_free(web_tmp);
		} break;
	}

	if (g_spawn_command_line_async(command, &error) == FALSE) {
		char *tmp = g_strdup_printf(_("There was an error launching your chosen browser: %s"), error->message);