7 files changed, 15 insertions, 9 deletions
diff --git a/widgets/shortcut-bar/ChangeLog b/widgets/shortcut-bar/ChangeLog
index 3ca816c467..5ee884aa9b 100644
--- a/widgets/shortcut-bar/ChangeLog
+++ b/widgets/shortcut-bar/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
+
+	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
+	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
+
+	* e-icon-bar.c, e-icon-bar.h, e-shortcut-bar.c,
+	e-shortcut-model.c, test-shortcut-bar.c: Fixed the #include lines
+	to deal properly with gal.
+
 2000-08-16  Larry Ewing  <lewing@helixcode.com>
 
 	* e-icon-bar.c (e_icon_bar_init): remove COLOR_TEXT references.
diff --git a/widgets/shortcut-bar/Makefile.am b/widgets/shortcut-bar/Makefile.am
index 9f17d684b6..721b251fd7 100644
--- a/widgets/shortcut-bar/Makefile.am
+++ b/widgets/shortcut-bar/Makefile.am
@@ -28,10 +28,7 @@ test_shortcut_bar_SOURCES = 	\
 
 test_shortcut_bar_LDADD = 		\
 	./libshortcut-bar.a		\
-	$(top_builddir)/widgets/e-paned/libepaned.a		\
-	../e-text/libetext.a		\
 	../misc/libemiscwidgets.a	\
-	../../e-util/libeutil.la	\
 	$(EXTRA_GNOME_LIBS)
 
 test_shortcut_bar_LDFLAGS =	\
diff --git a/widgets/shortcut-bar/e-icon-bar.c b/widgets/shortcut-bar/e-icon-bar.c
index af5b23a6b3..35f5d23f93 100644
--- a/widgets/shortcut-bar/e-icon-bar.c
+++ b/widgets/shortcut-bar/e-icon-bar.c
@@ -33,8 +33,8 @@
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
 #include "e-icon-bar.h"
 #include "e-icon-bar-bg-item.h"
-#include "../e-text/e-text.h"
-#include "e-util/e-canvas-utils.h"
+#include <gal/e-text/e-text.h>
+#include <gal/widgets/e-canvas-utils.h>
 
 /* These are the offsets of the icons & text in both views. Note that the
    shadow around icons is drawn in the space between items (as is the
diff --git a/widgets/shortcut-bar/e-icon-bar.h b/widgets/shortcut-bar/e-icon-bar.h
index 90d9f5a2cf..47a806cae5 100644
--- a/widgets/shortcut-bar/e-icon-bar.h
+++ b/widgets/shortcut-bar/e-icon-bar.h
@@ -26,7 +26,7 @@
 
 #include <gdk_imlib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "../../e-util/e-canvas.h"
+#include <gal/widgets/e-canvas.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/shortcut-bar/e-shortcut-bar.c b/widgets/shortcut-bar/e-shortcut-bar.c
index a7d7f76aba..2826f612d5 100644
--- a/widgets/shortcut-bar/e-shortcut-bar.c
+++ b/widgets/shortcut-bar/e-shortcut-bar.c
@@ -35,7 +35,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 #include "e-shortcut-bar.h"
 #include "e-clipped-label.h"
 #include "e-vscrolled-bar.h"
diff --git a/widgets/shortcut-bar/e-shortcut-model.c b/widgets/shortcut-bar/e-shortcut-model.c
index 61cfe54a4b..2151a4144b 100644
--- a/widgets/shortcut-bar/e-shortcut-model.c
+++ b/widgets/shortcut-bar/e-shortcut-model.c
@@ -30,7 +30,7 @@
 
 #include <config.h>
 #include <gtk/gtksignal.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 #include "e-shortcut-model.h"
 
 /* This contains information on one item. */
diff --git a/widgets/shortcut-bar/test-shortcut-bar.c b/widgets/shortcut-bar/test-shortcut-bar.c
index 9197fdf16e..aafb54ccb0 100644
--- a/widgets/shortcut-bar/test-shortcut-bar.c
+++ b/widgets/shortcut-bar/test-shortcut-bar.c
@@ -30,7 +30,7 @@
 
 #include "e-shortcut-bar.h"
 
-#include <widgets/e-paned/e-hpaned.h>
+#include <gal/e-paned/e-hpaned.h>
 
 #define NUM_SHORTCUT_TYPES 5
 gchar *shortcut_types[NUM_SHORTCUT_TYPES] = {