[gimp] app: remove "help_id" from GimpGeglProcedure
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: remove "help_id" from GimpGeglProcedure
- Date: Sun, 8 Sep 2019 21:44:44 +0000 (UTC)
commit 5341c42852c8080ce595c071162c6391698c720e
Author: Michael Natterer <mitch gimp org>
Date: Sun Sep 8 23:44:13 2019 +0200
app: remove "help_id" from GimpGeglProcedure
GimpProcedure handles it just right now.
app/actions/gimpgeglprocedure.c | 14 +-------------
app/actions/gimpgeglprocedure.h | 1 -
2 files changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/app/actions/gimpgeglprocedure.c b/app/actions/gimpgeglprocedure.c
index 8840eed43b..7016c2cd0d 100644
--- a/app/actions/gimpgeglprocedure.c
+++ b/app/actions/gimpgeglprocedure.c
@@ -64,7 +64,6 @@ static gchar * gimp_gegl_procedure_get_description (GimpViewable *viewabl
static const gchar * gimp_gegl_procedure_get_label (GimpProcedure *procedure);
static const gchar * gimp_gegl_procedure_get_menu_label (GimpProcedure *procedure);
-static const gchar * gimp_gegl_procedure_get_help_id (GimpProcedure *procedure);
static gboolean gimp_gegl_procedure_get_sensitive (GimpProcedure *procedure,
GimpObject *object,
const gchar **tooltip);
@@ -105,7 +104,6 @@ gimp_gegl_procedure_class_init (GimpGeglProcedureClass *klass)
proc_class->get_label = gimp_gegl_procedure_get_label;
proc_class->get_menu_label = gimp_gegl_procedure_get_menu_label;
- proc_class->get_help_id = gimp_gegl_procedure_get_help_id;
proc_class->get_sensitive = gimp_gegl_procedure_get_sensitive;
proc_class->execute = gimp_gegl_procedure_execute;
proc_class->execute_async = gimp_gegl_procedure_execute_async;
@@ -126,7 +124,6 @@ gimp_gegl_procedure_finalize (GObject *object)
g_clear_pointer (&proc->operation, g_free);
g_clear_pointer (&proc->menu_label, g_free);
g_clear_pointer (&proc->label, g_free);
- g_clear_pointer (&proc->help_id, g_free);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -194,14 +191,6 @@ gimp_gegl_procedure_get_menu_label (GimpProcedure *procedure)
return GIMP_PROCEDURE_CLASS (parent_class)->get_menu_label (procedure);
}
-static const gchar *
-gimp_gegl_procedure_get_help_id (GimpProcedure *procedure)
-{
- GimpGeglProcedure *proc = GIMP_GEGL_PROCEDURE (procedure);
-
- return proc->help_id;
-}
-
static gboolean
gimp_gegl_procedure_get_sensitive (GimpProcedure *procedure,
GimpObject *object,
@@ -436,7 +425,6 @@ gimp_gegl_procedure_new (Gimp *gimp,
gegl_procedure->operation = g_strdup (operation);
gegl_procedure->default_run_mode = default_run_mode;
gegl_procedure->menu_label = g_strdup (menu_label);
- gegl_procedure->help_id = g_strdup (help_id);
if (default_settings)
gegl_procedure->default_settings = g_object_ref (default_settings);
@@ -446,7 +434,7 @@ gimp_gegl_procedure_new (Gimp *gimp,
gimp_procedure_set_help (procedure,
tooltip,
tooltip,
- NULL);
+ help_id);
gimp_procedure_set_static_attribution (procedure,
"author", "copyright", "date");
diff --git a/app/actions/gimpgeglprocedure.h b/app/actions/gimpgeglprocedure.h
index 8a7a27e0df..2991a3ff2b 100644
--- a/app/actions/gimpgeglprocedure.h
+++ b/app/actions/gimpgeglprocedure.h
@@ -47,7 +47,6 @@ struct _GimpGeglProcedure
gchar *menu_label;
gchar *label;
- gchar *help_id;
};
struct _GimpGeglProcedureClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]