Remove image/sifz mimetype and merge sifz extensions into image/sif.

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

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 7fef232..2edd9d5 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -3,16 +3,17 @@
 ** Template File
 ** $Id: toolbox.cpp,v 1.3 2005/01/13 20:23:01 darco Exp $
 **
-** 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.
 **
 ** === N O T E S ===========================================================
 **
@@ -198,7 +199,6 @@ Toolbox::Toolbox():
                Gdk::WINDOW_TYPE_HINT_UTILITY
 #endif
        );
-       set_keep_below(true);
        set_keep_above(false);
        set_role("toolbox");
 
@@ -376,7 +376,7 @@ Toolbox::Toolbox():
 
        add_accel_group(App::ui_manager()->get_accel_group());
        
-       App::signal_present_all().connect(sigc::mem_fun(*this,&Toolbox::present));
+       App::signal_present_all().connect(sigc::mem_fun0(*this,&Toolbox::present));
 }
 
 Toolbox::~Toolbox()