[gthumb] Fixed TemplateEvalFunc signature
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] Fixed TemplateEvalFunc signature
- Date: Sat, 19 Jun 2021 18:10:36 +0000 (UTC)
commit 8cfd48d1d522d2e904453323bd7d9a296fba80a7
Author: Paolo Bacchilega <paobac src gnome org>
Date: Fri May 21 07:58:54 2021 +0200
Fixed TemplateEvalFunc signature
Use TemplateFlags instead of parent_code as first argument.
extensions/rename_series/dlg-rename-series.c | 12 ++++++------
gthumb/str-utils.h | 26 +++++++++++++-------------
gthumb/test-glib-utils.c | 12 ++++++------
3 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/extensions/rename_series/dlg-rename-series.c b/extensions/rename_series/dlg-rename-series.c
index a9a881f5..00e0f323 100644
--- a/extensions/rename_series/dlg-rename-series.c
+++ b/extensions/rename_series/dlg-rename-series.c
@@ -150,12 +150,12 @@ get_attribute_value (GthFileData *file_data,
static gboolean
-template_eval_cb (gunichar root_code,
- gunichar parent_code,
- gunichar code,
- char **args,
- GString *result,
- gpointer user_data)
+template_eval_cb (TemplateFlags flags,
+ gunichar parent_code,
+ gunichar code,
+ char **args,
+ GString *result,
+ gpointer user_data)
{
TemplateData *template_data = user_data;
char *text = NULL;
diff --git a/gthumb/str-utils.h b/gthumb/str-utils.h
index acc2ef9a..d54d271a 100644
--- a/gthumb/str-utils.h
+++ b/gthumb/str-utils.h
@@ -112,19 +112,19 @@ typedef enum {
TEMPLATE_FLAGS_PARTIAL = (1 << 2),
} TemplateFlags;
-typedef gboolean (*TemplateForEachFunc) (gunichar parent_code,
- gunichar code,
- char **args,
- gpointer user_data);
-typedef gboolean (*TemplateEvalFunc) (gunichar root_code,
- gunichar parent_code,
- gunichar code,
- char **args,
- GString *result,
- gpointer user_data);
-typedef char * (*TemplatePreviewFunc) (const char *tmpl,
- TemplateFlags flags,
- gpointer user_data);
+typedef gboolean (*TemplateForEachFunc) (gunichar parent_code,
+ gunichar code,
+ char **args,
+ gpointer user_data);
+typedef gboolean (*TemplateEvalFunc) (TemplateFlags flags,
+ gunichar parent_code,
+ gunichar code,
+ char **args,
+ GString *result,
+ gpointer user_data);
+typedef char * (*TemplatePreviewFunc) (const char *tmpl,
+ TemplateFlags flags,
+ gpointer user_data);
char ** _g_template_tokenize (const char *tmpl,
TemplateFlags flags);
diff --git a/gthumb/test-glib-utils.c b/gthumb/test-glib-utils.c
index 8cfbdfd2..14a0730c 100644
--- a/gthumb/test-glib-utils.c
+++ b/gthumb/test-glib-utils.c
@@ -784,12 +784,12 @@ test_g_template_token_is_all (void)
static gboolean
-eval_template_cb (gunichar root_code,
- gunichar parent_code,
- gunichar code,
- char **args,
- GString *result,
- gpointer user_data)
+eval_template_cb (TemplateFlags flags,
+ gunichar parent_code,
+ gunichar code,
+ char **args,
+ GString *result,
+ gpointer user_data)
{
int i;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]