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

Bill Skaggs <weskaggs@primate.ucdavis.edu> 

* app/tools/gimprectangletool.c: don't crash when
	user modifies width/height of nonexistent rectangle, and
	make sure to disconnect option notify handlers in dispose.
	Should fix bug #322396.
This commit is contained in:
William Skaggs 2005-11-28 22:30:24 +00:00
parent 84fed8962d
commit 7a316db9e5
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-11-28 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/tools/gimprectangletool.c: don't crash when
user modifies width/height of nonexistent rectangle, and
make sure to disconnect option notify handlers in dispose.
Should fix bug #322396.
2005-11-27 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdeviceinfo.[ch]: added GdkDisplay member since

17
app/tools/gimprectangletool.c
View File

@ -1219,10 +1219,13 @@ gimp_rectangle_tool_constructor (GObject *object)
void
gimp_rectangle_tool_dispose (GObject *object)
{
GimpTool *tool = GIMP_TOOL (object);
GimpRectangleTool *rectangle = GIMP_RECTANGLE_TOOL (object);
GtkWidget *controls;
GObject *options;
g_object_get (rectangle, "controls", &controls, NULL);
options = G_OBJECT (tool->tool_info->tool_options);
if (controls)
{
@ -1230,6 +1233,13 @@ gimp_rectangle_tool_dispose (GObject *object)
g_free (controls);
g_object_set (rectangle, "controls", NULL, NULL);
}
g_signal_handlers_disconnect_by_func (options,
G_CALLBACK (gimp_rectangle_tool_notify_width),
rectangle);
g_signal_handlers_disconnect_by_func (options,
G_CALLBACK (gimp_rectangle_tool_notify_height),
rectangle);
}
gboolean
@ -2621,6 +2631,10 @@ gimp_rectangle_tool_notify_width (GimpRectangleOptions *options,
GimpCoords coords;
gdouble width = gimp_rectangle_options_get_width (options);
/* make sure a rectangle exists */
if (! GIMP_TOOL (rectangle)->gdisp)
return;
g_object_get (rectangle,
"x1", &rx1,
"y1", &ry1,
@ -2653,6 +2667,9 @@ gimp_rectangle_tool_notify_height (GimpRectangleOptions *options,
GimpCoords coords;
gdouble height = gimp_rectangle_options_get_height (options);
if (! GIMP_TOOL (rectangle)->gdisp)
return;
g_object_get (rectangle,
"x1", &rx1,
"y1", &ry1,