From e52c59eff3d26059fe9783ac3f218aeea58bc739 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 7 Apr 2005 10:33:58 +0000 Subject: [PATCH] some files that I missed in my last commit --- ChangeLog | 3 ++ app/config/gimprc-serialize.c | 6 ++-- app/dialogs/preferences-dialog.c | 47 ++++++++++++++------------------ app/tools/gimptexttool.c | 9 +++--- 4 files changed, 31 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e61b9fb62..7b5ebe5817 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,16 +10,19 @@ * app/config/gimpcoreconfig.c * app/config/gimpdisplayconfig.c * app/config/gimprc.c + * app/config/gimprc-serialize.c * app/core/gimpimage-grid.c * app/core/gimpimage-new.c * app/core/gimpstrokedesc.c * app/dialogs/grid-dialog.c * app/dialogs/image-new-dialog.c * app/dialogs/stroke-dialog.c + * app/dialogs/preferences-dialog.c * app/display/gimpdisplayshell.c * app/text/gimptextlayer.c * app/text/gimptextundo.c * app/tools/gimptextoptions.c + * app/tools/gimptexttool.c: * libgimpconfig/gimpconfig-iface.c: changed accordingly. 2005-04-07 Sven Neumann diff --git a/app/config/gimprc-serialize.c b/app/config/gimprc-serialize.c index bd47439073..5952516714 100644 --- a/app/config/gimprc-serialize.c +++ b/app/config/gimprc-serialize.c @@ -47,8 +47,7 @@ gimp_rc_serialize (GimpConfig *config, { if (data && GIMP_IS_RC (data)) { - if (! gimp_rc_serialize_properties_diff (config, GIMP_CONFIG (data), - writer)) + if (! gimp_rc_serialize_properties_diff (config, data, writer)) return FALSE; } else @@ -76,7 +75,8 @@ gimp_rc_serialize_properties_diff (GimpConfig *config, klass = G_OBJECT_GET_CLASS (config); - diff = gimp_config_diff (config, compare, GIMP_CONFIG_PARAM_SERIALIZE); + diff = gimp_config_diff (G_OBJECT (config), + G_OBJECT (compare), GIMP_CONFIG_PARAM_SERIALIZE); if (! diff) return TRUE; diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 062c641ede..11f208179b 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -237,10 +237,10 @@ prefs_response (GtkWidget *widget, if (response_id == GTK_RESPONSE_OK) { - GimpConfig *config_copy; - GList *restart_diff; - GList *confirm_diff; - GList *list; + GObject *config_copy; + GList *restart_diff; + GList *confirm_diff; + GList *list; config_copy = g_object_get_data (G_OBJECT (dialog), "config-copy"); @@ -249,7 +249,7 @@ prefs_response (GtkWidget *widget, gtk_widget_set_sensitive (GTK_WIDGET (dialog), FALSE); - confirm_diff = gimp_config_diff (GIMP_CONFIG (gimp->edit_config), + confirm_diff = gimp_config_diff (G_OBJECT (gimp->edit_config), config_copy, GIMP_CONFIG_PARAM_CONFIRM); @@ -257,14 +257,12 @@ prefs_response (GtkWidget *widget, for (list = confirm_diff; list; list = g_list_next (list)) { - GParamSpec *param_spec; - GValue value = { 0, }; - - param_spec = (GParamSpec *) list->data; + GParamSpec *param_spec = list->data; + GValue value = { 0, }; g_value_init (&value, param_spec->value_type); - g_object_get_property (G_OBJECT (config_copy), + g_object_get_property (config_copy, param_spec->name, &value); g_object_set_property (G_OBJECT (gimp->edit_config), param_spec->name, &value); @@ -281,8 +279,8 @@ prefs_response (GtkWidget *widget, /* spit out a solely informational warning about changed values * which need restart */ - restart_diff = gimp_config_diff (GIMP_CONFIG (gimp->edit_config), - GIMP_CONFIG (gimp->config), + restart_diff = gimp_config_diff (G_OBJECT (gimp->edit_config), + G_OBJECT (gimp->config), GIMP_CONFIG_PARAM_RESTART); if (restart_diff) @@ -309,9 +307,9 @@ prefs_response (GtkWidget *widget, } else /* cancel */ { - GimpConfig *config_orig; - GList *diff; - GList *list; + GObject *config_orig; + GList *diff; + GList *list; config_orig = g_object_get_data (G_OBJECT (dialog), "config-orig"); @@ -320,26 +318,23 @@ prefs_response (GtkWidget *widget, gtk_widget_set_sensitive (GTK_WIDGET (dialog), FALSE); - diff = gimp_config_diff (GIMP_CONFIG (gimp->edit_config), config_orig, + diff = gimp_config_diff (G_OBJECT (gimp->edit_config), + config_orig, GIMP_CONFIG_PARAM_SERIALIZE); g_object_freeze_notify (G_OBJECT (gimp->edit_config)); for (list = diff; list; list = g_list_next (list)) { - GParamSpec *param_spec; - GValue value = { 0, }; - - param_spec = (GParamSpec *) list->data; + GParamSpec *param_spec = list->data; + GValue value = { 0, }; g_value_init (&value, param_spec->value_type); - g_object_get_property (G_OBJECT (config_orig), - param_spec->name, - &value); + g_object_get_property (config_orig, + param_spec->name, &value); g_object_set_property (G_OBJECT (gimp->edit_config), - param_spec->name, - &value); + param_spec->name, &value); g_value_unset (&value); } @@ -362,7 +357,7 @@ prefs_template_select_callback (GimpContainerView *view, GimpTemplate *edit_template) { if (template) - gimp_config_sync (GIMP_CONFIG (template), GIMP_CONFIG (edit_template), 0); + gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template), 0); } static void diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 242916c233..0265792240 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -213,9 +213,9 @@ gimp_text_tool_init (GimpTextTool *text_tool) text_tool->layer = NULL; text_tool->image = NULL; - gimp_tool_control_set_scroll_lock (tool->control, TRUE); - gimp_tool_control_set_tool_cursor (tool->control, - GIMP_TOOL_CURSOR_TEXT); + gimp_tool_control_set_scroll_lock (tool->control, TRUE); + gimp_tool_control_set_tool_cursor (tool->control, + GIMP_TOOL_CURSOR_TEXT); gimp_tool_control_set_action_object_1 (tool->control, "context/context-font-select-set"); } @@ -408,8 +408,7 @@ gimp_text_tool_connect (GimpTextTool *text_tool, if (text) { - gimp_config_sync (GIMP_CONFIG (text), - GIMP_CONFIG (text_tool->proxy), 0); + gimp_config_sync (G_OBJECT (text), G_OBJECT (text_tool->proxy), 0); text_tool->text = g_object_ref (text);