procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 09:53:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

libgimp: do not export private GimpProcedureConfig functions in the lib.

Browse source 
Some of these should not even be visible by libgimp and were just fine as static
as well! For the rest, I make them really private (not only with a private
header).
This commit is contained in:
Jehan 2023-10-15 17:32:04 +02:00
parent b2f633a26c
commit 652a1b4388
5 changed files with 46 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libgimp/gimp.def
View file

@ -734,14 +734,7 @@ EXPORTS
gimp_procedure_config_get_procedure gimp_procedure_config_get_procedure
gimp_procedure_config_get_type gimp_procedure_config_get_type
gimp_procedure_config_get_values gimp_procedure_config_get_values
gimp_procedure_config_has_default
gimp_procedure_config_load_default
gimp_procedure_config_load_last
gimp_procedure_config_load_parasite
gimp_procedure_config_save_default
gimp_procedure_config_save_last
gimp_procedure_config_save_metadata gimp_procedure_config_save_metadata
gimp_procedure_config_save_parasite
gimp_procedure_config_set_values gimp_procedure_config_set_values
gimp_procedure_create_config gimp_procedure_create_config
gimp_procedure_extension_ready 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 */ /* if saved defaults exist, they override GParamSpec */
config = gimp_procedure_create_config (procedure); 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); config_class = G_OBJECT_GET_CLASS (config);
else else
g_clear_object (&config); g_clear_object (&config);

18
libgimp/gimpprocedureconfig-private.h
View file

@ -41,23 +41,11 @@ void _gimp_procedure_config_end_export (GimpProcedureConfig *config,
GimpPDBStatusType status); GimpPDBStatusType status);
gboolean gimp_procedure_config_has_default (GimpProcedureConfig *config); 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); GError **error);
gboolean gimp_procedure_config_save_default (GimpProcedureConfig *config, gboolean _gimp_procedure_config_save_default (GimpProcedureConfig *config,
GError **error);
gboolean gimp_procedure_config_load_last (GimpProcedureConfig *config,
GError **error);
gboolean gimp_procedure_config_save_last (GimpProcedureConfig *config,
GError **error);
gboolean gimp_procedure_config_load_parasite (GimpProcedureConfig *config,
GimpImage *image,
GError **error);
gboolean gimp_procedure_config_save_parasite (GimpProcedureConfig *config,
GimpImage *image,
GError **error); GError **error);

64
libgimp/gimpprocedureconfig.c
View file

@ -68,21 +68,33 @@ struct _GimpProcedureConfigPrivate
}; };
static void gimp_procedure_config_constructed (GObject *object); static void gimp_procedure_config_constructed (GObject *object);
static void gimp_procedure_config_dispose (GObject *object); static void gimp_procedure_config_dispose (GObject *object);
static void gimp_procedure_config_set_property (GObject *object, static void gimp_procedure_config_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gimp_procedure_config_get_property (GObject *object, static void gimp_procedure_config_get_property (GObject *object,
guint property_id, guint property_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static GFile * gimp_procedure_config_get_file (GimpProcedureConfig *config, static gboolean gimp_procedure_config_load_last (GimpProcedureConfig *config,
const gchar *extension); GError **error);
static gchar * gimp_procedure_config_parasite_name (GimpProcedureConfig *config, static gboolean gimp_procedure_config_save_last (GimpProcedureConfig *config,
const gchar *suffix); GError **error);
static gboolean gimp_procedure_config_load_parasite (GimpProcedureConfig *config,
GimpImage *image,
GError **error);
static gboolean gimp_procedure_config_save_parasite (GimpProcedureConfig *config,
GimpImage *image,
GError **error);
static GFile * gimp_procedure_config_get_file (GimpProcedureConfig *config,
const gchar *extension);
static gchar * gimp_procedure_config_parasite_name (GimpProcedureConfig *config,
const gchar *suffix);
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GimpProcedureConfig, gimp_procedure_config, G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GimpProcedureConfig, gimp_procedure_config,
@ -959,7 +971,7 @@ _gimp_procedure_config_end_export (GimpProcedureConfig *config,
} }
gboolean gboolean
gimp_procedure_config_has_default (GimpProcedureConfig *config) _gimp_procedure_config_has_default (GimpProcedureConfig *config)
{ {
GFile *file; GFile *file;
gboolean success; gboolean success;
@ -975,8 +987,8 @@ gimp_procedure_config_has_default (GimpProcedureConfig *config)
} }
gboolean gboolean
gimp_procedure_config_load_default (GimpProcedureConfig *config, _gimp_procedure_config_load_default (GimpProcedureConfig *config,
GError **error) GError **error)
{ {
GFile *file; GFile *file;
gboolean success; gboolean success;
@ -1001,8 +1013,8 @@ gimp_procedure_config_load_default (GimpProcedureConfig *config,
} }
gboolean gboolean
gimp_procedure_config_save_default (GimpProcedureConfig *config, _gimp_procedure_config_save_default (GimpProcedureConfig *config,
GError **error) GError **error)
{ {
GFile *file; GFile *file;
gboolean success; gboolean success;
@ -1023,7 +1035,10 @@ gimp_procedure_config_save_default (GimpProcedureConfig *config,
return success; return success;
} }
gboolean
/* private functions */
static gboolean
gimp_procedure_config_load_last (GimpProcedureConfig *config, gimp_procedure_config_load_last (GimpProcedureConfig *config,
GError **error) GError **error)
{ {
@ -1049,7 +1064,7 @@ gimp_procedure_config_load_last (GimpProcedureConfig *config,
return success; return success;
} }
gboolean static gboolean
gimp_procedure_config_save_last (GimpProcedureConfig *config, gimp_procedure_config_save_last (GimpProcedureConfig *config,
GError **error) GError **error)
{ {
@ -1072,7 +1087,7 @@ gimp_procedure_config_save_last (GimpProcedureConfig *config,
return success; return success;
} }
gboolean static gboolean
gimp_procedure_config_load_parasite (GimpProcedureConfig *config, gimp_procedure_config_load_parasite (GimpProcedureConfig *config,
GimpImage *image, GimpImage *image,
GError **error) GError **error)
@ -1100,7 +1115,7 @@ gimp_procedure_config_load_parasite (GimpProcedureConfig *config,
return success; return success;
} }
gboolean static gboolean
gimp_procedure_config_save_parasite (GimpProcedureConfig *config, gimp_procedure_config_save_parasite (GimpProcedureConfig *config,
GimpImage *image, GimpImage *image,
GError **error) GError **error)
@ -1128,9 +1143,6 @@ gimp_procedure_config_save_parasite (GimpProcedureConfig *config,
return TRUE; return TRUE;
} }
/* private functions */
static GFile * static GFile *
gimp_procedure_config_get_file (GimpProcedureConfig *config, gimp_procedure_config_get_file (GimpProcedureConfig *config,
const gchar *extension) const gchar *extension)

8
libgimp/gimpproceduredialog.c
View file

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