Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp b/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp
index f26927a..53d5fc5 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp
+++ b/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp
@@ -2,19 +2,20 @@
 /*!    \file mod_palette.cpp
 **     \brief Template File
 **
-**     $Id: mod_palette.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \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
 */
 /* ========================================================================= */
@@ -35,6 +36,8 @@
 #include "../app.h"
 #include "../dockmanager.h"
 
+#include "../general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -58,20 +61,20 @@ studio::ModPalette::start_vfunc()
        dock_pal_edit=new Dock_PalEdit();
        App::get_dock_manager()->register_dockable(*dock_pal_edit);
 
-       dock_pal_browse=new Dock_PalBrowse();
-       App::get_dock_manager()->register_dockable(*dock_pal_browse);
-       
+       //dock_pal_browse=new Dock_PalBrowse();
+       //App::get_dock_manager()->register_dockable(*dock_pal_browse);
+
        return true;
 }
 
 bool
 studio::ModPalette::stop_vfunc()
 {
-       App::get_dock_manager()->unregister_dockable(*dock_pal_browse);
+       //App::get_dock_manager()->unregister_dockable(*dock_pal_browse);
        App::get_dock_manager()->unregister_dockable(*dock_pal_edit);
 
        delete dock_pal_edit;
-       delete dock_pal_browse;
+       //delete dock_pal_browse;
 
        return true;
 }