dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp: export again gimp_procedure_config_*_default() functions. 

This partially revert some of the changes in commit 652a1b4388 because the
Windows CI suddenly failed because of this (my local build on Linux didn't have
any problem though) with:

> /usr/bin/x86_64-w64-mingw32-ld: libgimp/libgimpui-3.0-0.dll.p/gimpproceduredialog.c.obj: in function `gimp_procedure_dialog_save_defaults':
> /builds/GNOME/gimp/_build/../libgimp/gimpproceduredialog.c:2570:(.text+0x633): undefined reference to `_gimp_procedure_config_save_default'
> /usr/bin/x86_64-w64-mingw32-ld: /builds/GNOME/gimp/_build/../libgimp/gimpproceduredialog.c:2576:(.text+0x644): undefined reference to `_gimp_procedure_config_has_default'
> /usr/bin/x86_64-w64-mingw32-ld: libgimp/libgimpui-3.0-0.dll.p/gimpproceduredialog.c.obj: in function `gimp_procedure_dialog_load_defaults':
> /builds/GNOME/gimp/_build/../libgimp/gimpproceduredialog.c:2549:(.text+0xa2f): undefined reference to `_gimp_procedure_config_load_default'
> /usr/bin/x86_64-w64-mingw32-ld: libgimp/libgimpui-3.0-0.dll.p/gimpproceduredialog.c.obj: in function `gimp_procedure_dialog_constructed':
> /builds/GNOME/gimp/_build/../libgimp/gimpproceduredialog.c:368:(.text+0x11b1): undefined reference to `_gimp_procedure_config_has_default'

This is because these functions are used not only inside libgimp but also
across inside libgimpui. As a consequence, the build fails when linking
libgimpui.
This commit is contained in:
Jehan 2023-10-15 23:20:44 +02:00
parent f25e0448b2
commit a101fd60eb
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libgimp/gimp.def
View File

@ -733,6 +733,9 @@ EXPORTS
gimp_procedure_config_get_choice_id
gimp_procedure_config_get_procedure
gimp_procedure_config_get_type
gimp_procedure_config_has_default
gimp_procedure_config_load_default
gimp_procedure_config_save_default
gimp_procedure_config_save_metadata
gimp_procedure_create_config
gimp_procedure_extension_ready

2
libgimp/gimpprocedure.c
View File

@ -1905,7 +1905,7 @@ gimp_procedure_run (GimpProcedure *procedure,
/* if saved defaults exist, they override GParamSpec */
config = gimp_procedure_create_config (procedure);
if (_gimp_procedure_config_load_default (config, NULL))
if (gimp_procedure_config_load_default (config, NULL))
config_class = G_OBJECT_GET_CLASS (config);
else
g_clear_object (&config);

15
libgimp/gimpprocedureconfig-private.h
View File

@ -22,6 +22,9 @@
#ifndef __GIMP_PROCEDURE_CONFIG_PRIVATE_H__
#define __GIMP_PROCEDURE_CONFIG_PRIVATE_H__
G_BEGIN_DECLS
void _gimp_procedure_config_get_values (GimpProcedureConfig *config,
GimpValueArray *values);
@ -44,12 +47,18 @@ void _gimp_procedure_config_end_export (GimpProcedureConfig *config,
GimpPDBStatusType status);
gboolean _gimp_procedure_config_has_default (GimpProcedureConfig *config);
/* These 3 functions are not marked internal because they are used in libgimpui.
* The headers is not installed so these functions should be considered not
* existing. Yet they are still exported in the library.
*/
gboolean gimp_procedure_config_has_default (GimpProcedureConfig *config);
gboolean _gimp_procedure_config_load_default (GimpProcedureConfig *config,
gboolean gimp_procedure_config_load_default (GimpProcedureConfig *config,
GError **error);
gboolean _gimp_procedure_config_save_default (GimpProcedureConfig *config,
gboolean gimp_procedure_config_save_default (GimpProcedureConfig *config,
GError **error);
G_END_DECLS
#endif /* __GIMP_PROCEDURE_CONFIG_PRIVATE_H__ */

10
libgimp/gimpprocedureconfig.c
View File

@ -927,7 +927,7 @@ _gimp_procedure_config_end_export (GimpProcedureConfig *config,
}
gboolean
_gimp_procedure_config_has_default (GimpProcedureConfig *config)
gimp_procedure_config_has_default (GimpProcedureConfig *config)
{
GFile *file;
gboolean success;
@ -943,8 +943,8 @@ _gimp_procedure_config_has_default (GimpProcedureConfig *config)
}
gboolean
_gimp_procedure_config_load_default (GimpProcedureConfig *config,
GError **error)
gimp_procedure_config_load_default (GimpProcedureConfig *config,
GError **error)
{
GFile *file;
gboolean success;
@ -969,8 +969,8 @@ _gimp_procedure_config_load_default (GimpProcedureConfig *config,
}
gboolean
_gimp_procedure_config_save_default (GimpProcedureConfig *config,
GError **error)
gimp_procedure_config_save_default (GimpProcedureConfig *config,
GError **error)
{
GFile *file;
gboolean success;

8
libgimp/gimpproceduredialog.c
View File

@ -366,7 +366,7 @@ gimp_procedure_dialog_constructed (GObject *object)
G_CALLBACK (gimp_procedure_dialog_load_defaults),
dialog);
gtk_widget_set_sensitive (button,
_gimp_procedure_config_has_default (dialog->priv->config));
gimp_procedure_config_has_default (dialog->priv->config));
dialog->priv->load_settings_button = button;
button = gtk_button_new_with_mnemonic (_("_Save Settings"));
@ -2546,7 +2546,7 @@ gimp_procedure_dialog_load_defaults (GtkWidget *button,
{
GError *error = NULL;
if (! _gimp_procedure_config_load_default (dialog->priv->config, &error))
if (! gimp_procedure_config_load_default (dialog->priv->config, &error))
{
if (error)
{
@ -2567,14 +2567,14 @@ gimp_procedure_dialog_save_defaults (GtkWidget *button,
{
GError *error = NULL;
if (! _gimp_procedure_config_save_default (dialog->priv->config, &error))
if (! gimp_procedure_config_save_default (dialog->priv->config, &error))
{
g_printerr ("Saving default values to disk failed: %s\n",
error->message);
g_clear_error (&error);
}
gtk_widget_set_sensitive (dialog->priv->load_settings_button,
_gimp_procedure_config_has_default (dialog->priv->config));
gimp_procedure_config_has_default (dialog->priv->config));
}
static gboolean