gimp r24661 - in branches/gimp-2-4: . app/widgets

[mitch svn gnome org]

Author: mitch
Date: Mon Jan 21 16:20:12 2008
New Revision: 24661
URL: http://svn.gnome.org/viewvc/gimp?rev=24661&view=rev

Log:
2008-01-21  Michael Natterer  <mitch gimp org>

	Merged from trunk:

	* app/widgets/gimpcolorbar.c (gimp_color_bar_class_init): fix the
	ID of the "histogram-channel" property.



Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/app/widgets/gimpcolorbar.c

Modified: branches/gimp-2-4/app/widgets/gimpcolorbar.c
==============================================================================
--- branches/gimp-2-4/app/widgets/gimpcolorbar.c	(original)
+++ branches/gimp-2-4/app/widgets/gimpcolorbar.c	Mon Jan 21 16:20:12 2008
@@ -75,13 +75,15 @@
                                                       GTK_ORIENTATION_HORIZONTAL,
                                                       GIMP_PARAM_WRITABLE |
                                                       G_PARAM_CONSTRUCT_ONLY));
+
   g_object_class_install_property (object_class, PROP_COLOR,
                                    gimp_param_spec_rgb ("color",
                                                         NULL, NULL,
                                                         FALSE, &white,
                                                         GIMP_PARAM_WRITABLE |
                                                         G_PARAM_CONSTRUCT));
-  g_object_class_install_property (object_class, PROP_ORIENTATION,
+
+  g_object_class_install_property (object_class, PROP_CHANNEL,
                                    g_param_spec_enum ("histogram-channel",
                                                       NULL, NULL,
                                                       GIMP_TYPE_HISTOGRAM_CHANNEL,