Fix 1499921 (debian #365102): synfigstudio startup crashes on amd64

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

diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.cpp b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
index 82a675c..227380c 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/childrentree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file childrentree.cpp
 **     \brief Template File
 **
 **     $Id: childrentree.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
 */
 /* ========================================================================= */
@@ -31,8 +32,8 @@
 #include "childrentree.h"
 #include "cellrenderer_value.h"
 #include "cellrenderer_timetrack.h"
-#include <sinfgapp/action.h>
-#include <sinfgapp/instance.h>
+#include <synfigapp/action.h>
+#include <synfigapp/instance.h>
 #include <gtkmm/scrolledwindow.h>
 
 #endif
@@ -41,7 +42,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -121,7 +122,7 @@ ChildrenTree::ChildrenTree()
                // Set up the value cell-renderer
                cellrenderer_value=ChildrenTreeStore::add_cell_renderer_value(column);
                cellrenderer_value->signal_edited().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_edited_value));
-               cellrenderer_value->property_value()=sinfg::ValueBase();
+               cellrenderer_value->property_value()=synfig::ValueBase();
 
                // Finish setting up the column
                tree_view.append_column(*column);
@@ -180,12 +181,12 @@ ChildrenTree::ChildrenTree()
        
 /*
        Gtk::Image *icon;
-       //Gtk::IconSize iconsize(Gtk::IconSize::from_name("sinfg-small_icon"));
+       //Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon"));
        Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR);
 
        SMALL_BUTTON(button_raise,"gtk-go-up","Raise");
        SMALL_BUTTON(button_lower,"gtk-go-down","Lower");
-       SMALL_BUTTON(button_duplicate,"sinfg-duplicate","Duplicate");
+       SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate");
        SMALL_BUTTON(button_delete,"gtk-delete","Delete");
        
        hbox->pack_start(*button_raise,Gtk::PACK_SHRINK);
@@ -264,7 +265,7 @@ ChildrenTree::on_selection_changed()
 
 
 void
-ChildrenTree::on_edited_value(const Glib::ustring&path_string,sinfg::ValueBase value)
+ChildrenTree::on_edited_value(const Glib::ustring&path_string,synfig::ValueBase value)
 {
        Gtk::TreePath path(path_string);
        
@@ -275,13 +276,13 @@ ChildrenTree::on_edited_value(const Glib::ustring&path_string,sinfg::ValueBase v
 }
 
 void
-ChildrenTree::on_waypoint_clicked(const Glib::ustring &path_string, sinfg::Waypoint waypoint,int button)
+ChildrenTree::on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button)
 {
        Gtk::TreePath path(path_string);
        
        const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path));
        
-       signal_waypoint_clicked()(static_cast<sinfgapp::ValueDesc>(row[model.value_desc]),waypoint,button);
+       signal_waypoint_clicked()(static_cast<synfigapp::ValueDesc>(row[model.value_desc]),waypoint,button);
 }
 
 bool