Fix 1677632: newly drawn lines are joined on to existing lines and ducks wherever...

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

diff --git a/synfig-studio/trunk/src/gtkmm/statemanager.cpp b/synfig-studio/trunk/src/gtkmm/statemanager.cpp
index ae88390..81cd39d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/statemanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/statemanager.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file template.cpp
 **     \brief Template File
 **
 **     $Id: statemanager.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,7 +32,7 @@
 #include "statemanager.h"
 #include <gtkmm/actiongroup.h>
 #include <gtkmm/action.h>
-#include <sinfg/string.h>
+#include <synfig/string.h>
 #include "app.h"
 #include "toolbox.h"
 
@@ -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 ========================================================= */
@@ -81,7 +82,7 @@ StateManager::add_state(const Smach::state_base *state)
        Glib::RefPtr<Gtk::Action> action(
                Gtk::Action::create(
                        "state-"+name,
-                       Gtk::StockID("sinfg-"+name),
+                       Gtk::StockID("synfig-"+name),
                        name,
                        name
                )