From b590dc1a2fbd224c85f5191e47f30d21e27451d8 Mon Sep 17 00:00:00 2001 From: Jehan Date: Sun, 1 Feb 2026 22:40:27 +0100 Subject: [PATCH] =?UTF-8?q?app,=20libgimp,=20pdb:=20use=20deprecated=20and?= =?UTF-8?q?=20deprecated=5Fsince=20rather=20than=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … std_pdb_deprecated for previously deprecated functions. The &std_pdb_deprecated() call won't set a "Deprecated since" information since this can't be made generic anyway. We have the info, it'd be a shame not to document it! Also it clears the blurb and help string, which I find unhelpful (even for deprecated functions, it's better to have proper documentation!). --- app/pdb/drawable-select-cmds.c | 30 ++++++++++++++++++------------ libgimp/gimpdrawableselect_pdb.c | 18 +++++++++++++++--- pdb/groups/drawable_select.pdb | 9 ++++++--- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/app/pdb/drawable-select-cmds.c b/app/pdb/drawable-select-cmds.c index 633b909d49..cac49b2022 100644 --- a/app/pdb/drawable-select-cmds.c +++ b/app/pdb/drawable-select-cmds.c @@ -140,13 +140,15 @@ register_drawable_select_procs (GimpPDB *pdb) gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-drawables-popup"); gimp_procedure_set_static_help (procedure, - "Deprecated: Use 'gimp-items-popup' instead.", + "Invokes the drawable selection dialog.", + "Opens a dialog letting a user choose an drawable.\n" + "\n" "Deprecated: Use 'gimp-items-popup' instead.", NULL); gimp_procedure_set_static_attribution (procedure, - "", - "", - ""); + "Jehan", + "Jehan", + "2023"); gimp_procedure_set_deprecated (procedure, "gimp-items-popup"); gimp_procedure_add_argument (procedure, @@ -192,13 +194,15 @@ register_drawable_select_procs (GimpPDB *pdb) gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-drawables-close-popup"); gimp_procedure_set_static_help (procedure, - "Deprecated: Use 'gimp-items-close-popup' instead.", + "Close the drawable selection dialog.", + "Closes an open drawable selection dialog.\n" + "\n" "Deprecated: Use 'gimp-items-close-popup' instead.", NULL); gimp_procedure_set_static_attribution (procedure, - "", - "", - ""); + "Jehan", + "Jehan", + "2023"); gimp_procedure_set_deprecated (procedure, "gimp-items-close-popup"); gimp_procedure_add_argument (procedure, @@ -218,13 +222,15 @@ register_drawable_select_procs (GimpPDB *pdb) gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-drawables-set-popup"); gimp_procedure_set_static_help (procedure, - "Deprecated: Use 'gimp-items-set-popup' instead.", + "Sets the selected drawable in a drawable selection dialog.", + "Sets the selected drawable in a drawable selection dialog.\n" + "\n" "Deprecated: Use 'gimp-items-set-popup' instead.", NULL); gimp_procedure_set_static_attribution (procedure, - "", - "", - ""); + "Jehan", + "Jehan", + "2023"); gimp_procedure_set_deprecated (procedure, "gimp-items-set-popup"); gimp_procedure_add_argument (procedure, diff --git a/libgimp/gimpdrawableselect_pdb.c b/libgimp/gimpdrawableselect_pdb.c index 893610dbc9..5c8cdd5240 100644 --- a/libgimp/gimpdrawableselect_pdb.c +++ b/libgimp/gimpdrawableselect_pdb.c @@ -44,7 +44,11 @@ * @initial_drawable: (nullable): The drawable to set as the initial choice. * @parent_window: (nullable): An optional parent window handle for the popup to be set transient to. * - * Deprecated: : Use gimp_items_popup() instead. + * Invokes the drawable selection dialog. + * + * Opens a dialog letting a user choose an drawable. + * + * Deprecated: 3.2: Use gimp_items_popup() instead. * * Returns: TRUE on success. **/ @@ -83,7 +87,11 @@ gimp_drawables_popup (const gchar *callback, * gimp_drawables_close_popup: * @callback: The name of the callback registered for this pop-up. * - * Deprecated: : Use gimp_items_close_popup() instead. + * Close the drawable selection dialog. + * + * Closes an open drawable selection dialog. + * + * Deprecated: 3.2: Use gimp_items_close_popup() instead. * * Returns: TRUE on success. **/ @@ -115,7 +123,11 @@ gimp_drawables_close_popup (const gchar *callback) * @callback: The name of the callback registered for this pop-up. * @drawable: The drawable to set as selected. * - * Deprecated: : Use gimp_items_set_popup() instead. + * Sets the selected drawable in a drawable selection dialog. + * + * Sets the selected drawable in a drawable selection dialog. + * + * Deprecated: 3.2: Use gimp_items_set_popup() instead. * * Returns: TRUE on success. **/ diff --git a/pdb/groups/drawable_select.pdb b/pdb/groups/drawable_select.pdb index 5fac814d3e..9e4268f8c8 100644 --- a/pdb/groups/drawable_select.pdb +++ b/pdb/groups/drawable_select.pdb @@ -19,7 +19,8 @@ sub drawables_popup { $help = 'Opens a dialog letting a user choose an drawable.'; &jehan_pdb_misc('2023'); - &std_pdb_deprecated ('gimp-items-popup'); + $deprecated = 'gimp-items-popup'; + $deprecated_since = '3.2'; @inargs = ( { name => 'callback', type => 'string', non_empty => 1, @@ -55,7 +56,8 @@ sub drawables_close_popup { $help = 'Closes an open drawable selection dialog.'; &jehan_pdb_misc('2023'); - &std_pdb_deprecated ('gimp-items-close-popup'); + $deprecated = 'gimp-items-close-popup'; + $deprecated_since = '3.2'; @inargs = ( { name => 'callback', type => 'string', non_empty => 1, @@ -79,7 +81,8 @@ sub drawables_set_popup { $help = $blurb; &jehan_pdb_misc('2023'); - &std_pdb_deprecated ('gimp-items-set-popup'); + $deprecated = 'gimp-items-set-popup'; + $deprecated_since = '3.2'; @inargs = ( { name => 'callback', type => 'string', non_empty => 1,