diff options
| author | Josh Rickmar <jrick@devio.us> | 2012-08-01 16:38:36 -0400 |
|---|---|---|
| committer | Josh Rickmar <jrick@devio.us> | 2012-08-01 16:38:36 -0400 |
| commit | 9a1c6920d2ad5ab284fda4672a39d55d1546e298 (patch) | |
| tree | f28d34fcea1b5d863681811e7757e9188fceaa31 | |
| parent | e5017e8231a6a3dc13f3ef76913f407f1dcb870a (diff) | |
| download | xombrero-9a1c6920d2ad5ab284fda4672a39d55d1546e298.tar.gz | |
Don't run the (struct setting).ismodified function in the as on of the
parameters to the g_strdup_printf() call. This makes the tooltips appear correctly on about:runtime when compiled with gcc (clang never exposed this issue).
| -rw-r--r-- | settings.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/settings.c b/settings.c index ebb01fe..f1b2483 100644 --- a/settings.c +++ b/settings.c @@ -3581,6 +3581,7 @@ print_runtime_setting(struct settings *s, char *val, void *cb_args) { char *tmp, *tt = NULL; struct settings_args *sa = cb_args; + int modified = 0; int i; if (sa == NULL) @@ -3590,12 +3591,14 @@ print_runtime_setting(struct settings *s, char *val, void *cb_args) return; tmp = *sa->body; + if (s->ismodified) + modified = s->ismodified(&tt); *sa->body = g_strdup_printf( "%s\n<tr %s>" "<td title=\"%s\" style='width: 240px;'><div style='width: 100%%;'>%s</div></td>" "<td title=\"%s\"><div style='width: 100%%; word-break:break-all'>", *sa->body, - (s->ismodified && s->ismodified(&tt)) ? "id='modified'" : "", + modified ? "id='modified'" : "", s->tt ? s->tt : "", s->name, tt); |