[gnome-panel] fish: remove unused parameter from locate_fortune_command
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] fish: remove unused parameter from locate_fortune_command
- Date: Sun, 21 Mar 2021 15:44:12 +0000 (UTC)
commit 5052cb7e5202551d1fb1e30aab61fef3f1fa846d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Mar 21 14:02:32 2021 +0200
fish: remove unused parameter from locate_fortune_command
modules/fish/fish-applet.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/modules/fish/fish-applet.c b/modules/fish/fish-applet.c
index 9a77c8ea9..1193285b9 100644
--- a/modules/fish/fish-applet.c
+++ b/modules/fish/fish-applet.c
@@ -339,13 +339,12 @@ something_fishy_going_on (FishApplet *fish,
static gboolean
locate_fortune_command (FishApplet *fish,
- int *argcp,
- char ***argvp)
+ char ***argvp)
{
char *prog = NULL;
if (fish->command
- && g_shell_parse_argv (fish->command, argcp, argvp, NULL)) {
+ && g_shell_parse_argv (fish->command, NULL, argvp, NULL)) {
prog = g_find_program_in_path ((*argvp)[0]);
if (prog) {
g_free (prog);
@@ -358,12 +357,12 @@ locate_fortune_command (FishApplet *fish,
prog = g_find_program_in_path ("fortune");
if (prog) {
g_free (prog);
- if (g_shell_parse_argv ("fortune", argcp, argvp, NULL))
+ if (g_shell_parse_argv ("fortune", NULL, argvp, NULL))
return FALSE;
}
if (g_file_test ("/usr/games/fortune", G_FILE_TEST_IS_EXECUTABLE)
- && g_shell_parse_argv ("/usr/games/fortune", argcp, argvp, NULL))
+ && g_shell_parse_argv ("/usr/games/fortune", NULL, argvp, NULL))
return FALSE;
something_fishy_going_on (fish,
@@ -541,7 +540,6 @@ display_fortune_dialog (FishApplet *fish)
gboolean user_command;
int output;
const char *charset;
- int argc;
char **argv;
/* if there is still a pipe, close it */
@@ -550,7 +548,7 @@ display_fortune_dialog (FishApplet *fish)
fish->source_id = 0;
fish_close_channel (fish);
- user_command = locate_fortune_command (fish, &argc, &argv);
+ user_command = locate_fortune_command (fish, &argv);
if (!argv)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]