[glom] Cleanups

[Murray Cumming <murrayc src gnome org>]

commit fed102d802efc7760715b27d6a239908bbab45e6
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 27 09:48:56 2010 +0100

    Cleanups

 Makefile_glom.am                                   |    2 --
 Makefile_tests.am                                  |    9 ---------
 .../print_layouts/print_layout_toolbar.cc          |    2 +-
 glom/utility_widgets/layouttoolbar.cc              |    6 +-----
 po/POTFILES.in                                     |    4 ----
 5 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/Makefile_glom.am b/Makefile_glom.am
index ece08cd..fcb4fe3 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -350,8 +350,6 @@ glom_glom_SOURCES +=							\
 endif
 
 glom_glom_LDADD = $(win_resfile) \
-	glom/utility_widgets/egg/toolpalette/libeggtoolpalette.a \
-	glom/utility_widgets/egg/util/libeggutil.a \
 	glom/libglom/libglom-$(GLOM_ABI_VERSION).la \
 	$(GLOM_LIBS) $(PYTHON_LIBS) $(INTLLIBS)
 if !GLOM_ENABLE_MAEMO
diff --git a/Makefile_tests.am b/Makefile_tests.am
index c3df9f4..36a8b45 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -20,7 +20,6 @@ check_PROGRAMS =						\
 	glom/libglom/test_document				\
 	glom/libglom/test_sharedptr_layoutitem			\
 	glom/utility_widgets/test_flowtable			\
-	glom/utility_widgets/egg/toolpalette/testtoolpalette	\
 	glom/test_pyembed					\
 	tests/test_parsing_time			\
 	tests/test_signal_reemit			\
@@ -85,9 +84,6 @@ glom_utility_widgets_test_flowtable_SOURCES =	\
 	glom/utility_widgets/test_flowtable.cc
 glom_utility_widgets_test_flowtable_LDADD = $(GLOM_LIBS)
 
-EGGTOOLPALETTE_LIBS = glom/utility_widgets/egg/toolpalette/libeggtoolpalette.a\
-	glom/utility_widgets/egg/util/libeggutil.a		\
-	$(EGG_LIBS)
 
 # You must remove PlaceholderGlom::get_application() to avoid having to specify 
 # a huge set of .cc files when building this test:
@@ -103,12 +99,7 @@ EGGTOOLPALETTE_LIBS = glom/utility_widgets/egg/toolpalette/libeggtoolpalette.a\
 #	glom/utility_widgets/placeholder-glom.h \
 #	glom/utility_widgets/placeholder-glom.cc \
 #	glom/utility_widgets/test_flowtable_dnd.cc
-# glom_utility_widgets_test_flowtable_dnd_LDADD = $(LIBGLOM_LA) $(GLOM_LIBS) $(EGGTOOLPALETTE_LIBS)
 
-glom_utility_widgets_egg_toolpalette_testtoolpalette_SOURCES =	\
-	glom/utility_widgets/egg/toolpalette/testtoolpalette.c
-glom_utility_widgets_egg_toolpalette_testtoolpalette_LDADD =	\
-	$(EGGTOOLPALETTE_LIBS)
 	
 
 glom_test_pyembed_LDADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS)
diff --git a/glom/mode_design/print_layouts/print_layout_toolbar.cc b/glom/mode_design/print_layouts/print_layout_toolbar.cc
index cd5b578..cd0fc2f 100644
--- a/glom/mode_design/print_layouts/print_layout_toolbar.cc
+++ b/glom/mode_design/print_layouts/print_layout_toolbar.cc
@@ -24,7 +24,7 @@
 #include <libglom/libglom_config.h>
 
 //#include "layoutwidgetbase.h"
-#include <gtk/gtktoolitemgroup.h>
+//#include <gtk/gtktoolitemgroup.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/layouttoolbar.cc b/glom/utility_widgets/layouttoolbar.cc
index b4c0207..9ee8ee8 100644
--- a/glom/utility_widgets/layouttoolbar.cc
+++ b/glom/utility_widgets/layouttoolbar.cc
@@ -24,7 +24,7 @@
 #include <libglom/libglom_config.h>
 
 #include "layoutwidgetbase.h"
-#include <gtk/gtktoolitemgroup.h>
+//#include <gtk/gtktoolitemgroup.h>
 
 namespace
 {
@@ -68,10 +68,6 @@ LayoutToolbar::LayoutToolbar()
   // Looks ugly otherwise:
   set_size_request(100, 200);
 
-  LayoutToolbarButton* drag_image = 
-    Gtk::manage(new LayoutToolbarButton("glom-image.png", LayoutWidgetBase::TYPE_IMAGE,
-                                        _("Image"), _("Drag this to the layout to add a new static image.")));
-
   //TODO: Add a drag item for the related records item.
   
   //Note for translators: These are container layout items, containing child layout items, like container widgets in GTK+.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2913512..871de52 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -120,10 +120,6 @@ glom/utility_widgets/datawidget.cc
 glom/utility_widgets/db_adddel/db_adddel.cc
 glom/utility_widgets/dialog_choose_id.cc
 glom/utility_widgets/dialog_image_progress.cc
-glom/utility_widgets/egg/toolpalette/eggenumaction.c
-glom/utility_widgets/egg/toolpalette/eggtoolitemgroup.c
-glom/utility_widgets/egg/toolpalette/eggtoolpalette.c
-glom/utility_widgets/egg/toolpalette/testtoolpalette.c
 glom/utility_widgets/entryglom.cc
 glom/utility_widgets/filechooserdialog_saveextras.cc
 glom/utility_widgets/imageglom.cc