dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverted the change for bug #356901 and instead applied a patch from 

2007-01-05  Sven Neumann  <sven@gimp.org>

	* libgimp/gimpbrushselectbutton.c: reverted the change for bug
	#356901 and instead applied a patch from Kyoichiro Suda that's
	actually a better fix and also plugs a memleak (see bug 
#393158).


svn path=/trunk/; revision=21658
This commit is contained in:
Sven Neumann 2007-01-05 20:30:35 +00:00 committed by Sven Neumann
parent 92edf42877
commit 606a97c862
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-05 Sven Neumann <sven@gimp.org>
* libgimp/gimpbrushselectbutton.c: reverted the change for bug
#356901 and instead applied a patch from Kyoichiro Suda that's
actually a better fix and also plugs a memleak (see bug #393158).
2007-01-05 Sven Neumann <sven@gimp.org>
* plug-ins/bmp/bmpread.c (ReadImage): applied patch from Aurimas

27
libgimp/gimpbrushselectbutton.c
View File

@ -288,6 +288,9 @@ gimp_brush_select_button_init (GimpBrushSelectButton *button)
&color_data_size,
&color_data);
if (color_data)
g_free (color_data);
priv->inside = gimp_brush_select_button_create_inside (button);
gtk_container_add (GTK_CONTAINER (button), priv->inside);
@ -320,15 +323,6 @@ gimp_brush_select_button_new (const gchar *title,
{
GtkWidget *button;
if (opacity < 0.0)
opacity = gimp_context_get_opacity ();
if (spacing == -1)
gimp_brush_get_spacing (brush_name, &spacing);
if (paint_mode == -1)
paint_mode = gimp_context_get_paint_mode ();
if (title)
button = g_object_new (GIMP_TYPE_BRUSH_SELECT_BUTTON,
"title", title,
@ -497,6 +491,9 @@ gimp_brush_select_button_set_property (GObject *object,
{
GimpBrushSelectButton *button = GIMP_BRUSH_SELECT_BUTTON (object);
GimpBrushSelectButtonPrivate *priv;
gdouble opacity;
gint32 spacing;
gint32 paint_mode;
priv = GIMP_BRUSH_SELECT_BUTTON_GET_PRIVATE (button);
@ -511,13 +508,19 @@ gimp_brush_select_button_set_property (GObject *object,
-1.0, -1, -1);
break;
case PROP_BRUSH_OPACITY:
priv->opacity = g_value_get_double (value);
opacity = g_value_get_double (value);
if (opacity >= 0.0)
priv->opacity = opacity;
break;
case PROP_BRUSH_SPACING:
priv->spacing = g_value_get_int (value);
spacing = g_value_get_int (value);
if (spacing != -1)
priv->spacing = spacing;
break;
case PROP_BRUSH_PAINT_MODE:
priv->paint_mode = g_value_get_int (value);
paint_mode = g_value_get_int (value);
if (paint_mode != -1)
priv->paint_mode = paint_mode;
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);