Change to Andreas Jochens patch for Debian bugs #358474/#359690

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

diff --git a/synfig-studio/trunk/src/gtkmm/keyframetree.cpp b/synfig-studio/trunk/src/gtkmm/keyframetree.cpp
index 6d6222b..f4af223 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/keyframetree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keyframetree.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file keyframetree.cpp
 **     \brief Template File
 **
 **     $Id: keyframetree.cpp,v 1.1.1.1 2005/01/07 03:34:36 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
 */
 /* ========================================================================= */
@@ -39,7 +40,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -140,7 +141,7 @@ KeyframeTree::KeyframeTree()
 
 KeyframeTree::~KeyframeTree()
 {
-       sinfg::info("KeyframeTree::~KeyframeTree(): deleted");
+       synfig::info("KeyframeTree::~KeyframeTree(): deleted");
 }
 
 void
@@ -197,13 +198,13 @@ KeyframeTree::set_editable(bool x)
 }
 
 void
-KeyframeTree::on_edited_time(const Glib::ustring&path_string,sinfg::Time time)
+KeyframeTree::on_edited_time(const Glib::ustring&path_string,synfig::Time time)
 {
        Gtk::TreePath path(path_string);
        
        const Gtk::TreeRow row(*(get_model()->get_iter(path)));
        
-       sinfg::Keyframe keyframe(row[model.keyframe]);
+       synfig::Keyframe keyframe(row[model.keyframe]);
        if(time!=keyframe.get_time())
        {
                row[model.time]=time;
@@ -214,7 +215,7 @@ KeyframeTree::on_edited_time(const Glib::ustring&path_string,sinfg::Time time)
 }
 
 void
-KeyframeTree::on_edited_time_delta(const Glib::ustring&path_string,sinfg::Time time)
+KeyframeTree::on_edited_time_delta(const Glib::ustring&path_string,synfig::Time time)
 {
        Gtk::TreePath path(path_string);
        
@@ -230,8 +231,8 @@ KeyframeTree::on_edited_description(const Glib::ustring&path_string,const Glib::
        
        const Gtk::TreeRow row = *(get_model()->get_iter(path));
        
-       const sinfg::String description(desc);
-       sinfg::Keyframe keyframe(row[model.keyframe]);
+       const synfig::String description(desc);
+       synfig::Keyframe keyframe(row[model.keyframe]);
        if(description!=keyframe.get_description())
        {
                row[model.description]=desc;