--- gimp-2.6.11-orig/app/tools/gimpmovetool.c	2010-07-03 07:51:55 +0900
+++ gimp-2.6.11/app/tools/gimpmovetool.c	2011-10-29 13:14:25 +0900
@@ -157,6 +157,7 @@
 
   move_tool->floating_layer     = NULL;
   move_tool->guide              = NULL;
+  move_tool->guide_shell        = NULL;
 
   move_tool->moving_guide       = FALSE;
   move_tool->guide_position     = -1;
@@ -215,6 +216,7 @@
 
   move->floating_layer     = NULL;
   move->guide              = NULL;
+  move->guide_shell        = NULL;
   move->moving_guide       = FALSE;
   move->old_active_layer   = NULL;
   move->old_active_vectors = NULL;
@@ -257,6 +259,7 @@
                                               FUNSCALEY (shell, snap_distance))))
             {
               move->guide             = guide;
+              move->guide_shell       = shell;
               move->moving_guide      = TRUE;
               move->guide_position    = gimp_guide_get_position (guide);
               move->guide_orientation = gimp_guide_get_orientation (guide);
@@ -410,6 +413,7 @@
             {
               gimp_image_remove_guide (display->image, move->guide, TRUE);
               move->guide = NULL;
+              move->guide_shell = NULL;
             }
         }
       else
@@ -427,12 +431,14 @@
                   move->guide = gimp_image_add_hguide (display->image,
                                                        move->guide_position,
                                                        TRUE);
+                  move->guide_shell = shell;
                   break;
 
                 case GIMP_ORIENTATION_VERTICAL:
                   move->guide = gimp_image_add_vguide (display->image,
                                                        move->guide_position,
                                                        TRUE);
+                  move->guide_shell = shell;
                   break;
 
                 default:
@@ -670,9 +676,10 @@
     }
 
   if (move->guide && move->guide != guide)
-    gimp_display_shell_draw_guide (shell, move->guide, FALSE);
+    gimp_display_shell_draw_guide (move->guide_shell, move->guide, FALSE);
 
-  move->guide = guide;
+  move->guide       = guide;
+  move->guide_shell = shell;
 
   if (move->guide)
     gimp_display_shell_draw_guide (shell, move->guide, TRUE);
@@ -827,6 +834,7 @@
                                    move->guide, FALSE);
 
   move->guide             = NULL;
+  move->guide_shell       = NULL;
   move->moving_guide      = TRUE;
   move->guide_position    = -1;
   move->guide_orientation = orientation;
--- gimp-2.6.11-orig/app/tools/gimpmovetool.h	2010-07-03 07:51:55 +0900
+++ gimp-2.6.11/app/tools/gimpmovetool.h	2011-10-29 13:07:22 +0900
@@ -42,6 +42,7 @@
 
   GimpLayer           *floating_layer;
   GimpGuide           *guide;
+  GimpDisplayShell    *guide_shell;
 
   gboolean             moving_guide;
   gint                 guide_position;