callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only write aux-info for properties that have been changed from their

Browse Source 
2004-07-08  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpsessioninfo.c: only write aux-info for properties
	that have been changed from their default values.

	* app/widgets/gimphistogrameditor.c: some code cleanup.
This commit is contained in:
Sven Neumann
2004-07-08 12:04:15 +00:00
committed by Sven Neumann
parent d18097028e
commit 8bc46f69f3
3 changed files with 37 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,10 @@
2004-07-08 Sven Neumann <sven@gimp.org>
* app/widgets/gimpsessioninfo.c: only write aux-info for properties
that have been changed from their default values.
* app/widgets/gimphistogrameditor.c: some code cleanup.
2004-07-08 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpselectiondata.[ch]: added a "const gchar *format"
@ -14,7 +21,6 @@
http://bugzilla.abisource.com/show_bug.cgi?id=7068)
2004-07-08 Sven Neumann <sven@gimp.org>
* app/config/gimpconfig-deserialize.c
* app/config/gimpconfig-serialize.c: removed redundant casts.

62
app/widgets/gimphistogrameditor.c
View File

@ -53,20 +53,13 @@ static void gimp_histogram_editor_docked_iface_init (GimpDockedInterface *doc
static void gimp_histogram_editor_set_aux_info (GimpDocked *docked,
GList *aux_info);
static GList * gimp_histogram_editor_get_aux_info (GimpDocked *docked);
static void gimp_histogram_editor_set_image (GimpImageEditor *editor,
GimpImage *gimage);
static void gimp_histogram_editor_range_changed (GimpHistogramView *view,
gint start,
gint end,
GimpHistogramEditor *editor);
static void gimp_histogram_editor_channel_notify (GimpHistogramView *view,
GParamSpec *pspec,
GimpHistogramEditor *editor);
static void gimp_histogram_editor_layer_changed (GimpImage *gimage,
GimpHistogramEditor *editor);
static void gimp_histogram_editor_update (GimpHistogramEditor *editor);
static gboolean gimp_histogram_editor_idle_update (GimpHistogramEditor *editor);
static gboolean gimp_histogram_editor_item_visible (GtkTreeModel *model,
GtkTreeIter *iter,
@ -118,9 +111,7 @@ gimp_histogram_editor_get_type (void)
static void
gimp_histogram_editor_class_init (GimpHistogramEditorClass* klass)
{
GimpImageEditorClass *image_editor_class;
image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
GimpImageEditorClass *image_editor_class = GIMP_IMAGE_EDITOR_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -192,13 +183,12 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
gtk_box_pack_start (GTK_BOX (editor), editor->box, TRUE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (editor->box));
g_signal_connect (view, "range_changed",
G_CALLBACK (gimp_histogram_editor_range_changed),
editor);
g_signal_connect (view, "notify::histogram-channel",
G_CALLBACK (gimp_histogram_editor_channel_notify),
editor);
g_signal_connect_swapped (view, "range_changed",
G_CALLBACK (gimp_histogram_editor_info_update),
editor);
g_signal_connect_swapped (view, "notify::histogram-channel",
G_CALLBACK (gimp_histogram_editor_info_update),
editor);
table = gtk_table_new (3, 4, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
@ -222,8 +212,6 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
GTK_FILL, GTK_FILL, 2, 2);
gtk_widget_show (label);
}
gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
}
static void
@ -251,8 +239,6 @@ gimp_histogram_editor_set_aux_info (GimpDocked *docked,
NULL);
}
#define AUX_INFO_channel "channel"
static GList *
gimp_histogram_editor_get_aux_info (GimpDocked *docked)
{
@ -276,11 +262,8 @@ static void
gimp_histogram_editor_set_image (GimpImageEditor *image_editor,
GimpImage *gimage)
{
GimpHistogramEditor *editor;
GimpHistogramView *view;
editor = GIMP_HISTOGRAM_EDITOR (image_editor);
view = GIMP_HISTOGRAM_BOX (editor->box)->view;
GimpHistogramEditor *editor = GIMP_HISTOGRAM_EDITOR (image_editor);
GimpHistogramView *view = GIMP_HISTOGRAM_BOX (editor->box)->view;
if (image_editor->gimage)
{
@ -329,35 +312,18 @@ gimp_histogram_editor_set_image (GimpImageEditor *image_editor,
GtkWidget *
gimp_histogram_editor_new (GimpImage *gimage)
{
GimpHistogramEditor *editor;
GimpImageEditor *editor;
g_return_val_if_fail (! gimage || GIMP_IS_IMAGE (gimage), NULL);
g_return_val_if_fail (gimage == NULL || GIMP_IS_IMAGE (gimage), NULL);
editor = g_object_new (GIMP_TYPE_HISTOGRAM_EDITOR, NULL);
if (gimage)
gimp_image_editor_set_image (GIMP_IMAGE_EDITOR (editor), gimage);
gimp_image_editor_set_image (editor, gimage);
return GTK_WIDGET (editor);
}
static void
gimp_histogram_editor_range_changed (GimpHistogramView *view,
gint start,
gint end,
GimpHistogramEditor *editor)
{
gimp_histogram_editor_info_update (editor);
}
static void
gimp_histogram_editor_channel_notify (GimpHistogramView *view,
GParamSpec *pspec,
GimpHistogramEditor *editor)
{
gimp_histogram_editor_info_update (editor);
}
static void
gimp_histogram_editor_layer_changed (GimpImage *gimage,
GimpHistogramEditor *editor)

30
app/widgets/gimpsessioninfo.c
View File

@ -87,13 +87,15 @@ gimp_session_info_free (GimpSessionInfo *info)
if (info->aux_info)
{
g_list_foreach (info->aux_info, (GFunc) gimp_session_info_aux_free, NULL);
g_list_foreach (info->aux_info,
(GFunc) gimp_session_info_aux_free, NULL);
g_list_free (info->aux_info);
}
if (info->books)
{
g_list_foreach (info->books, (GFunc) gimp_session_info_book_free, NULL);
g_list_foreach (info->books,
(GFunc) gimp_session_info_book_free, NULL);
g_list_free (info->books);
}
@ -155,12 +157,8 @@ gimp_session_info_aux_free (GimpSessionInfoAux *aux)
{
g_return_if_fail (aux != NULL);
if (aux->name)
g_free (aux->name);
if (aux->value)
g_free (aux->value);
g_free (aux->name);
g_free (aux->value);
g_free (aux);
}
@ -191,15 +189,19 @@ gimp_session_info_aux_new_from_props (GObject *object,
g_value_init (&value, pspec->value_type);
g_object_get_property (object, pspec->name, &value);
if (gimp_config_serialize_value (&value, str, FALSE))
list = g_list_prepend (list,
gimp_session_info_aux_new (prop_name,
str->str));
if (! g_param_value_defaults (pspec, &value) &&
gimp_config_serialize_value (&value, str, TRUE))
{
list = g_list_prepend (list,
gimp_session_info_aux_new (prop_name,
str->str));
}
g_value_unset (&value);
}
else
{
g_warning ("%s: no property names '%s' for %s",
g_warning ("%s: no property named '%s' for %s",
G_STRFUNC,
prop_name, G_OBJECT_CLASS_NAME (class));
}
@ -286,7 +288,7 @@ gimp_session_info_aux_set_props (GObject *object,
}
else
{
g_warning ("%s: no property names '%s' for %s",
g_warning ("%s: no property named '%s' for %s",
G_STRFUNC,
prop_name, G_OBJECT_CLASS_NAME (class));
}