glom r1625 - in trunk: . glom glom/utility_widgets glom/utility_widgets/egg

[jhs svn gnome org]

Author: jhs
Date: Mon Jun 16 10:19:23 2008
New Revision: 1625
URL: http://svn.gnome.org/viewvc/glom?rev=1625&view=rev

Log:
2008-06-16  Johannes Schmid  <johannes schmid openismus com>

	* configure.in:
	* glom/Makefile.am:
	* glom/utility_widgets/Makefile.am:
	* glom/utility_widgets/dragbar.cc:
	* glom/utility_widgets/egg/Makefile.am:
	* glom/utility_widgets/flowtable_dnd.cc:
	* glom/utility_widgets/sidebar.h:
	* glom/utility_widgets/egg/*:
	
	Included eggtoolbar instead of using svn:externals to fix distcheck (#520741)

Added:
   trunk/glom/utility_widgets/egg/
   trunk/glom/utility_widgets/egg/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/glom/Makefile.am
   trunk/glom/utility_widgets/Makefile.am
   trunk/glom/utility_widgets/dragbar.cc
   trunk/glom/utility_widgets/flowtable_dnd.cc
   trunk/glom/utility_widgets/sidebar.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jun 16 10:19:23 2008
@@ -221,8 +221,9 @@
         glom/utility_widgets/adddel/eggcolumnchooser/Makefile \
       glom/utility_widgets/canvas/Makefile \
       glom/utility_widgets/db_adddel/Makefile \
-      glom/utility_widgets/eggtoolpalette/Makefile \
-      glom/utility_widgets/util/Makefile \
+      glom/utility_widgets/egg/Makefile
+        glom/utility_widgets/egg/toolpalette/Makefile \
+        glom/utility_widgets/egg/util/Makefile \
       glom/python_embed/Makefile \
         glom/python_embed/python_module/Makefile \
     glom/relationships_overview/Makefile \

Modified: trunk/glom/Makefile.am
==============================================================================
--- trunk/glom/Makefile.am	(original)
+++ trunk/glom/Makefile.am	Mon Jun 16 10:19:23 2008
@@ -82,8 +82,8 @@
               utility_widgets/calendar/libutility_widgets_calendar.a \
               utility_widgets/canvas/libutility_widgets_canvas.a \
               utility_widgets/cellrendererlist/libutility_widgets_cellrendererlist.a \
-              utility_widgets/eggtoolpalette/libeggtoolpalette.la \
-              utility_widgets/util/libeggutil.la
+              utility_widgets/egg/toolpalette/libeggtoolpalette.la \
+              utility_widgets/egg/util/libeggutil.la
 
 glom_LDADD += python_embed/libpython_embed.a \
               $(top_builddir)/glom/libglom/libglom.la \

Modified: trunk/glom/utility_widgets/Makefile.am
==============================================================================
--- trunk/glom/utility_widgets/Makefile.am	(original)
+++ trunk/glom/utility_widgets/Makefile.am	Mon Jun 16 10:19:23 2008
@@ -1,6 +1,6 @@
 #AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS)
 
-SUBDIRS = cellrendererlist adddel db_adddel canvas calendar util eggtoolpalette 
+SUBDIRS = cellrendererlist adddel db_adddel canvas calendar egg 
 
 gladedir = $(datadir)/glom/glade/
 glom_icon_dir = $(datadir)/glom/pixmaps

Modified: trunk/glom/utility_widgets/dragbar.cc
==============================================================================
--- trunk/glom/utility_widgets/dragbar.cc	(original)
+++ trunk/glom/utility_widgets/dragbar.cc	Mon Jun 16 10:19:23 2008
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "layoutwidgetbase.h"
-#include "eggtoolpalette/eggtoolitemgroup.h"
+#include "egg/toolpalette/eggtoolitemgroup.h"
 
 namespace Glom
 {

Added: trunk/glom/utility_widgets/egg/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/glom/utility_widgets/egg/Makefile.am	Mon Jun 16 10:19:23 2008
@@ -0,0 +1 @@
+SUBDIRS = util toolpalette

Modified: trunk/glom/utility_widgets/flowtable_dnd.cc
==============================================================================
--- trunk/glom/utility_widgets/flowtable_dnd.cc	(original)
+++ trunk/glom/utility_widgets/flowtable_dnd.cc	Mon Jun 16 10:19:23 2008
@@ -20,7 +20,7 @@
 
 #include "flowtable_dnd.h"
 #include "../mode_data/flowtablewithfields.h"
-#include "eggtoolpalette/eggtoolpalette.h"
+#include "egg/toolpalette/eggtoolpalette.h"
 #include "placeholder-glom.h"
 #include "dragbutton.h"
 #include "entryglom.h"
@@ -38,7 +38,8 @@
   m_internal_drag (false)
 {
   std::list<Gtk::TargetEntry> drag_targets;
-  Gtk::TargetEntry toolbar_target (egg_tool_palette_get_drag_target_item());
+  const GtkTargetEntry* target_entry = egg_tool_palette_get_drag_target_item();
+  Gtk::TargetEntry toolbar_target (*target_entry);
   Gtk::TargetEntry move_target(MOVE_TARGET);
   drag_targets.push_back(toolbar_target);
   drag_targets.push_back(move_target);
@@ -80,7 +81,8 @@
   if (!(child.get_flags() & Gtk::NO_WINDOW))
   { 
     std::list<Gtk::TargetEntry> drag_targets;
-    Gtk::TargetEntry toolbar_target (egg_tool_palette_get_drag_target_item());
+    const GtkTargetEntry* target_entry = egg_tool_palette_get_drag_target_item();
+    Gtk::TargetEntry toolbar_target (*target_entry);
     Gtk::TargetEntry move_target(MOVE_TARGET);
     drag_targets.push_back(toolbar_target);
     drag_targets.push_back(move_target);

Modified: trunk/glom/utility_widgets/sidebar.h
==============================================================================
--- trunk/glom/utility_widgets/sidebar.h	(original)
+++ trunk/glom/utility_widgets/sidebar.h	Mon Jun 16 10:19:23 2008
@@ -25,8 +25,8 @@
 #include <gtkmm/handlebox.h>
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
-#include "eggtoolpalette/eggtoolpalette.h"
-#include "eggtoolpalette/eggtoolitemgroup.h"
+#include "egg/toolpalette/eggtoolpalette.h"
+#include "egg/toolpalette/eggtoolitemgroup.h"
 
 namespace Glom
 {