From b2b9155514b39b2aca16ce95fd59a4a4c40d6d49 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 30 Nov 2009 23:49:58 +0100 Subject: [PATCH] fix execigauge conversion to callbacks --- src/core.c | 2 +- src/exec.c | 6 +++--- src/exec.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core.c b/src/core.c index 1d5ab512..f7074828 100644 --- a/src/core.c +++ b/src/core.c @@ -570,7 +570,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long #endif /* X11 */ END OBJ_ARG(execigauge, 0, "execigauge needs arguments") scan_execi_arg(obj, arg); - obj->callbacks.print = &print_execigauge; + obj->callbacks.gaugeval = &execigaugeval; obj->callbacks.free = &free_execi; END OBJ_ARG(execi, 0, "execi needs arguments") scan_execi_arg(obj, arg); diff --git a/src/exec.c b/src/exec.c index 95cbb857..4b575c50 100644 --- a/src/exec.c +++ b/src/exec.c @@ -395,18 +395,18 @@ void print_execigraph(struct text_object *obj, char *p, int p_max_size) } #endif /* X11 */ -void print_execigauge(struct text_object *obj, char *p, int p_max_size) +uint8_t execigaugeval(struct text_object *obj) { struct execi_data *ed = obj->data.opaque; if (!ed) - return; + return 0; if (time_to_update(ed)) { ed->barnum = read_exec_barnum(ed->cmd) * 2.55; ed->last_update = current_update_time; } - new_gauge(obj, p, p_max_size, round_to_int(ed->barnum)); + return round_to_int(ed->barnum); } uint8_t execbarval(struct text_object *obj) diff --git a/src/exec.h b/src/exec.h index e8fe5d2c..800758cb 100644 --- a/src/exec.h +++ b/src/exec.h @@ -47,7 +47,7 @@ void print_execgauge(struct text_object *, char *, int); void print_execgraph(struct text_object *, char *, int); void print_execigraph(struct text_object *, char *, int); #endif /* X11 */ -void print_execigauge(struct text_object *, char *, int); +uint8_t execigaugeval(struct text_object *); uint8_t execbarval(struct text_object *); void print_execibar(struct text_object *, char *, int); void free_exec(struct text_object *);