debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use GAppInfo to spawn programs and support tokens like %f or %u

Browse source
This commit is contained in:
Christian Dywan 2009-11-02 22:00:30 +01:00
parent e982985976
commit 4fbbc43e42
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
midori/sokoke.c
View file

@ -147,41 +147,35 @@ sokoke_spawn_program (const gchar* command,
gboolean quote) gboolean quote)
{ {
gchar* argument_escaped; gchar* argument_escaped;
gchar* command_ready; GAppInfo* info;
gchar** argv; GFile* file;
GList* files;
GError* error; GError* error;
g_return_val_if_fail (command != NULL, FALSE); g_return_val_if_fail (command != NULL, FALSE);
g_return_val_if_fail (argument != NULL, FALSE); g_return_val_if_fail (argument != NULL, FALSE);
argument_escaped = quote ? g_shell_quote (argument) : g_strdup (argument); argument_escaped = quote ? g_shell_quote (argument) : g_strdup (argument);
if (strstr (command, "%s"))
command_ready = g_strdup_printf (command, argument_escaped); info = g_app_info_create_from_commandline (command,
else NULL, G_APP_INFO_CREATE_NONE, NULL);
command_ready = g_strconcat (command, " ", argument_escaped, NULL); file = g_file_new_for_commandline_arg (argument_escaped);
files = g_list_append (NULL, file);
error = NULL; error = NULL;
if (!g_shell_parse_argv (command_ready, NULL, &argv, &error)) if (!g_app_info_launch (info, files, NULL, &error))
{ {
error_dialog (_("Could not run external program."), error->message); error_dialog (_("Could not run external program."), error->message);
g_error_free (error); g_error_free (error);
g_free (command_ready);
g_free (argument_escaped); g_free (argument_escaped);
g_object_unref (file);
g_list_free (files);
return FALSE; return FALSE;
} }
error = NULL;
if (!g_spawn_async (NULL, argv, NULL,
(GSpawnFlags)G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, NULL, &error))
{
error_dialog (_("Could not run external program."), error->message);
g_error_free (error);
}
g_strfreev (argv);
g_free (command_ready);
g_free (argument_escaped); g_free (argument_escaped);
g_object_unref (file);
g_list_free (files);
return TRUE; return TRUE;
} }