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

Bug 616342 - gimp crashes on startup if you have a contextrc file from 2.6

Browse Source 
Remove the draw timeout in GObject::dispose() to be safe.
This commit is contained in:
Michael Natterer
2010-04-22 16:45:44 +02:00
parent 56e4585f70
commit 2f5d2bc85f
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/tools/gimpdrawtool.c
View File

@ -46,6 +46,8 @@
#define USE_TIMEOUT 1 #define USE_TIMEOUT 1
static void gimp_draw_tool_dispose (GObject *object);
static gboolean gimp_draw_tool_has_display (GimpTool *tool, static gboolean gimp_draw_tool_has_display (GimpTool *tool,
GimpDisplay *display); GimpDisplay *display);
static GimpDisplay * gimp_draw_tool_has_image (GimpTool *tool, static GimpDisplay * gimp_draw_tool_has_image (GimpTool *tool,
@ -83,7 +85,10 @@ G_DEFINE_TYPE (GimpDrawTool, gimp_draw_tool, GIMP_TYPE_TOOL)
static void static void
gimp_draw_tool_class_init (GimpDrawToolClass *klass) gimp_draw_tool_class_init (GimpDrawToolClass *klass)
{ {
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
object_class->dispose = gimp_draw_tool_dispose;
tool_class->has_display = gimp_draw_tool_has_display; tool_class->has_display = gimp_draw_tool_has_display;
tool_class->has_image = gimp_draw_tool_has_image; tool_class->has_image = gimp_draw_tool_has_image;
@ -101,6 +106,20 @@ gimp_draw_tool_init (GimpDrawTool *draw_tool)
draw_tool->is_drawn = FALSE; draw_tool->is_drawn = FALSE;
} }
static void
gimp_draw_tool_dispose (GObject *object)
{
GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (object);
if (draw_tool->draw_timeout)
{
g_source_remove (draw_tool->draw_timeout);
draw_tool->draw_timeout = 0;
}
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static gboolean static gboolean
gimp_draw_tool_has_display (GimpTool *tool, gimp_draw_tool_has_display (GimpTool *tool,
GimpDisplay *display) GimpDisplay *display)