From a214aad1d3574b83a2572dab89891f546522d403 Mon Sep 17 00:00:00 2001 From: William Skaggs Date: Sun, 10 Sep 2006 21:25:55 +0000 Subject: [PATCH] Bill Skaggs * plug-ins/common/depthmerge.c (dialogDepthMap2ChangedCallback): change "depthMap1Drawable" to "depthMap2Drawable" to fix typo introduced in version 1.35 committed on 2004-04-21. Should fix bug #355219. --- ChangeLog | 7 +++++++ plug-ins/common/depthmerge.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2cc3da27a5..f42ab57be8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-09-10 Bill Skaggs + + * plug-ins/common/depthmerge.c (dialogDepthMap2ChangedCallback): + change "depthMap1Drawable" to "depthMap2Drawable" to fix + typo introduced in version 1.35 committed on 2004-04-21. + Should fix bug #355219. + 2006-09-10 Sven Neumann * plug-ins/jpeg/jpeg-exif.c: added a thumbnail to the "Rotate diff --git a/plug-ins/common/depthmerge.c b/plug-ins/common/depthmerge.c index ccf1eccd79..37a59cdb4d 100644 --- a/plug-ins/common/depthmerge.c +++ b/plug-ins/common/depthmerge.c @@ -996,7 +996,7 @@ dialogDepthMap2ChangedCallback (GtkWidget *widget, gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &dm->params.depthMap2); - dm->depthMap1Drawable = ((dm->params.depthMap2 == -1) ? + dm->depthMap2Drawable = ((dm->params.depthMap2 == -1) ? NULL : gimp_drawable_get (dm->params.depthMap2));