Correcting revision 251. We should include <gtkmm/tooltips.h> into preview.h, not...

[synfig.git] / synfig-studio / trunk / src / gtkmm / layertreestore.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp
index 151cfc0..65be4ad 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp
@@ -5,16 +5,17 @@
 **     $Id: layertreestore.cpp,v 1.2 2005/01/12 07:03:42 darco Exp $
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -488,15 +489,15 @@ LayerTreeStore::drag_data_received_vfunc (const TreeModel::Path& dest, const Gtk
                TreeModel::Path dest_parent(dest);
                if(!dest_parent.up() || !get_iter(dest_parent))
                {
-                       TreeModel::Path dest(dest);
-                       if(!get_iter(dest))
-                               dest.prev();
+                       TreeModel::Path dest_(dest);
+                       if(!get_iter(dest_))
+                               dest_.prev();
 
-                       if(!get_iter(dest))
+                       if(!get_iter(dest_))
                                return false;
 
                        {
-                               row=(*get_iter(dest));
+                               row=(*get_iter(dest_));
                                dest_canvas=(Canvas::Handle)(row[model.canvas]);
                        }
                }