Commit 39cc3ecc authored by Michael Natterer's avatar Michael Natterer 😴

app: rename gimp-gegl-config-proxy.[ch] to gimp-gegl-config.[ch]

and rename its functions to make more sense.
parent ea13e816
......@@ -40,7 +40,7 @@
#include "core/gimpsettings.h"
#include "core/gimptoolinfo.h"
#include "gegl/gimp-gegl-config-proxy.h"
#include "gegl/gimp-gegl-config.h"
#include "display/gimpdisplay.h"
......@@ -253,11 +253,11 @@ gimp_gegl_procedure_execute_async (GimpProcedure *procedure,
GimpObject *settings;
GimpContainer *container;
settings = gimp_gegl_get_config_proxy (procedure->original_name,
gimp_viewable_get_icon_name (GIMP_VIEWABLE (procedure)),
GIMP_TYPE_SETTINGS);
settings = gimp_gegl_config_new (procedure->original_name,
gimp_viewable_get_icon_name (GIMP_VIEWABLE (procedure)),
GIMP_TYPE_SETTINGS);
container = gimp_gegl_get_config_container (G_TYPE_FROM_INSTANCE (settings));
container = gimp_gegl_config_get_container (G_TYPE_FROM_INSTANCE (settings));
g_object_unref (settings);
......@@ -272,7 +272,7 @@ gimp_gegl_procedure_execute_async (GimpProcedure *procedure,
node = gegl_node_new_child (NULL,
"operation", procedure->original_name,
NULL);
gimp_gegl_config_proxy_sync (settings, node);
gimp_gegl_config_sync_node (settings, node);
image = gimp_value_get_image (gimp_value_array_index (args, 1),
gimp);
......
......@@ -25,8 +25,8 @@ libappgegl_a_sources = \
gimp-gegl.h \
gimp-gegl-apply-operation.c \
gimp-gegl-apply-operation.h \
gimp-gegl-config-proxy.c \
gimp-gegl-config-proxy.h \
gimp-gegl-config.c \
gimp-gegl-config.h \
gimp-gegl-loops.c \
gimp-gegl-loops.h \
gimp-gegl-mask.c \
......
......@@ -32,7 +32,7 @@
#include "core/gimpparamspecs-duplicate.h"
#include "core/gimpviewable.h"
#include "gimp-gegl-config-proxy.h"
#include "gimp-gegl-config.h"
#include "gimp-gegl-utils.h"
......@@ -192,9 +192,9 @@ gimp_gegl_config_config_iface_init (GimpConfigInterface *iface)
}
GimpObject *
gimp_gegl_get_config_proxy (const gchar *operation,
const gchar *icon_name,
GType parent_type)
gimp_gegl_config_new (const gchar *operation,
const gchar *icon_name,
GType parent_type)
{
GType config_type;
......@@ -269,7 +269,7 @@ gimp_gegl_get_config_proxy (const gchar *operation,
}
GimpContainer *
gimp_gegl_get_config_container (GType config_type)
gimp_gegl_config_get_container (GType config_type)
{
GimpContainer *container;
......@@ -295,8 +295,8 @@ gimp_gegl_get_config_container (GType config_type)
}
void
gimp_gegl_config_proxy_sync (GimpObject *proxy,
GeglNode *node)
gimp_gegl_config_sync_node (GimpObject *proxy,
GeglNode *node)
{
GParamSpec **pspecs;
gchar *operation;
......
......@@ -15,17 +15,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_GEGL_CONFIG_PROXY_H__
#define __GIMP_GEGL_CONFIG_PROXY_H__
#ifndef __GIMP_GEGL_CONFIG_H__
#define __GIMP_GEGL_CONFIG_H__
GimpObject * gimp_gegl_get_config_proxy (const gchar *operation,
GimpObject * gimp_gegl_config_new (const gchar *operation,
const gchar *icon_name,
GType parent_type);
GimpContainer * gimp_gegl_get_config_container (GType config_type);
GimpContainer * gimp_gegl_config_get_container (GType config_type);
void gimp_gegl_config_proxy_sync (GimpObject *proxy,
void gimp_gegl_config_sync_node (GimpObject *config,
GeglNode *node);
#endif /* __GIMP_GEGL_CONFIG_PROXY_H__ */
#endif /* __GIMP_GEGL_CONFIG_H__ */
......@@ -41,7 +41,7 @@
#include "core/gimpprogress.h"
#include "core/gimpprojection.h"
#include "gegl/gimp-gegl-config-proxy.h"
#include "gegl/gimp-gegl-config.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpwidgets-utils.h"
......@@ -801,7 +801,8 @@ gimp_blend_tool_start_preview (GimpBlendTool *blend_tool,
gimp_blend_tool_create_image_map (blend_tool, drawable);
/* Initially sync all of the properties */
gimp_gegl_config_proxy_sync (GIMP_OBJECT (options), blend_tool->render_node);
gimp_gegl_config_sync_node (GIMP_OBJECT (options),
blend_tool->render_node);
/* Connect signal handlers for the gradient */
gimp_blend_tool_set_gradient (blend_tool, context->gradient);
......
......@@ -29,7 +29,7 @@
#include "tools-types.h"
#include "gegl/gimp-gegl-config-proxy.h"
#include "gegl/gimp-gegl-config.h"
#include "gegl/gimp-gegl-utils.h"
#include "core/gimpchannel.h"
......@@ -258,9 +258,9 @@ gimp_operation_tool_get_operation (GimpImageMapTool *im_tool,
GimpOperationTool *tool = GIMP_OPERATION_TOOL (im_tool);
if (tool->operation)
*config = G_OBJECT (gimp_gegl_get_config_proxy (tool->operation,
tool->icon_name,
GIMP_TYPE_SETTINGS));
*config = G_OBJECT (gimp_gegl_config_new (tool->operation,
tool->icon_name,
GIMP_TYPE_SETTINGS));
if (tool->undo_desc)
*undo_desc = g_strdup (tool->undo_desc);
......@@ -279,8 +279,8 @@ static void
gimp_operation_tool_map (GimpImageMapTool *im_tool)
{
if (im_tool->config)
gimp_gegl_config_proxy_sync (GIMP_OBJECT (im_tool->config),
im_tool->operation);
gimp_gegl_config_sync_node (GIMP_OBJECT (im_tool->config),
im_tool->operation);
}
static void
......@@ -356,7 +356,7 @@ gimp_operation_tool_get_settings_ui (GimpImageMapTool *im_tool,
gchar *import_title;
gchar *export_title;
settings = gimp_gegl_get_config_container (type);
settings = gimp_gegl_config_get_container (type);
if (! gimp_list_get_sort_func (GIMP_LIST (settings)))
gimp_list_set_sort_func (GIMP_LIST (settings),
(GCompareFunc) gimp_settings_compare);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment