--- /home/ccview/melbourne/ccadmin/SOFTS_GTK_dev_linux_snap/vob/SOFTS/GTK/gtk_sources/gtk+-2.18.9/gtk/gtkdnd.c	2011-03-11 09:07:13.000000000 +0100
+++ /home/ccview/melbourne/ccadmin/SOFTS_GTK_dev_linux_snap/vob/SOFTS/GTK/gtk_sources/gtk_patchs/gtk/gtkdnd.c	2011-03-11 09:07:09.000000000 +0100
@@ -2969,8 +2969,13 @@
 
 	  info->icon_window = NULL;
 	  if (!default_icon_pixmap)
-	    set_icon_stock_pixbuf (info->context, 
-				   GTK_STOCK_DND, NULL, -2, -2, TRUE);
+	    {
+	      if(save_icon_window)
+		gtk_widget_hide(save_icon_window);
+	      set_icon_stock_pixbuf (info->context, 
+				     GTK_STOCK_DND, NULL, -2, -2, FALSE);
+	      return;
+	    }
 	  else
 	    gtk_drag_set_icon_pixmap (info->context, 
 				      default_icon_colormap, 
@@ -3022,15 +3027,17 @@
       gint hot_x, hot_y;
   
       gtk_drag_get_icon (info, &icon_window, &hot_x, &hot_y);
-      
-      gtk_window_move (GTK_WINDOW (icon_window), 
-		       info->cur_x - hot_x, 
-		       info->cur_y - hot_y);
+      if(icon_window)
+	{
+	  gtk_window_move (GTK_WINDOW (icon_window), 
+			   info->cur_x - hot_x, 
+			   info->cur_y - hot_y);
 
-      if (GTK_WIDGET_VISIBLE (icon_window))
-	gdk_window_raise (icon_window->window);
-      else
-	gtk_widget_show (icon_window);
+	  if (GTK_WIDGET_VISIBLE (icon_window))
+	    gdk_window_raise (icon_window->window);
+	  else
+	    gtk_widget_show (icon_window);
+	}
     }
 }
 
