From: Dana Jansens Date: Thu, 28 Feb 2008 03:19:59 +0000 (-0500) Subject: clean up the execute action code, and free the prompt option string X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=1018b836c4d7e94efa8f74b4a34e1a93b9b51a20;p=chaz%2Fopenbox clean up the execute action code, and free the prompt option string --- diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c index 4197109f..eb1b461d 100644 --- a/openbox/actions/execute.c +++ b/openbox/actions/execute.c @@ -79,6 +79,7 @@ static void free_func(gpointer options) g_free(o->sn_name); g_free(o->sn_icon); g_free(o->sn_wmclass); + g_free(o->prompt); g_free(o); } } @@ -97,20 +98,13 @@ static Options* dup_options(Options *in) static gboolean run_func(ObActionsData *data, gpointer options); -static void prompt_cb(ObPrompt *p, gint result, gpointer data) +static void prompt_cb(ObPrompt *p, gint result, gpointer options) { - Options *options = data; - if (result) run_func(NULL, options); prompt_unref(p); - - g_free(options->cmd); - g_free(options->sn_name); - g_free(options->sn_icon); - g_free(options->sn_wmclass); - g_free(options); + free_func(options); } /* Always return FALSE because its not interactive */