Added widgets in INCLUDES.

2005-06-23  Kaushal Kumar  <kakumar@novell.com>

        * e-util/Makefile.am, widgets/e-timezone-dialog/Makefile.am,
        addressbook/gui/search/Makefile.am,
        plugins/groupwise-features/Makefile.am: Added widgets in INCLUDES.

        Updated the include paths to use misc instead of widgets/misc.

svn path=/trunk/; revision=29574

19 files changed, 32 insertions, 31 deletions

diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index eaf289ae2d..d9ef3f6340 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -36,8 +36,8 @@
 #include "addressbook/gui/widgets/eab-menu.h"
 #include "addressbook/gui/widgets/eab-config.h"
 
-#include "widgets/misc/e-task-bar.h"
-#include "widgets/misc/e-info-label.h"
+#include "misc/e-task-bar.h"
+#include "misc/e-info-label.h"
 
 #include <string.h>
 #include <bonobo/bonobo-i18n.h>
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 7ce078ff17..c9892a91c7 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -43,8 +43,8 @@
 #include <libedataserverui/e-passwords.h>
 
 #include "e-util/e-error.h"
-#include "widgets/misc/e-task-bar.h"
-#include "widgets/misc/e-info-label.h"
+#include "misc/e-task-bar.h"
+#include "misc/e-info-label.h"
 
 
 #include "e-util/e-icon-factory.h"
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index de2f7eccc8..1200511c30 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkstock.h>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 145437bf33..04b5be12ee 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -41,7 +41,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libedataserverui/e-categories-dialog.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <text/e-entry.h>
 
 #include <libebook/e-address-western.h>
@@ -55,9 +55,9 @@
 #include "addressbook/gui/widgets/eab-gui-util.h"
 #include "e-util/e-gui-utils.h"
 #include "e-util/e-error.h"
-#include "widgets/misc/e-dateedit.h"
-#include "widgets/misc/e-image-chooser.h"
-#include "widgets/misc/e-url-entry.h"
+#include "misc/e-dateedit.h"
+#include "misc/e-image-chooser.h"
+#include "misc/e-url-entry.h"
 #include "shell/evolution-shell-component-utils.h"
 #include "e-util/e-icon-factory.h"
 
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 357c9d8ebf..fd48e53af7 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -38,7 +38,7 @@
 
 #include "shell/evolution-shell-component-utils.h"
 
-#include "widgets/misc/e-image-chooser.h"
+#include "misc/e-image-chooser.h"
 
 #include "addressbook/gui/component/addressbook.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index 4148a8145c..f667e0345c 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = addresstypes.xml
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LTLIBRARIES =				\
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 36bebc2cbc..387f467158 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -14,7 +14,7 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 #include <gnome.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include "eab-gui-util.h"
 
 #define PARENT_TYPE G_TYPE_OBJECT
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 0eb5d92a3e..df4c6a2c36 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -12,7 +12,7 @@
 #include "eab-gui-util.h"
 
 #include "e-minicard.h"
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/printing/e-contact-print-envelope.h"
 
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index 2eda094e60..b237b2fbb8 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -2,7 +2,7 @@
 #ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 
-#include <widgets/misc/e-reflow-model.h>
+#include <misc/e-reflow-model.h>
 #include <libebook/e-contact.h>
 #include "e-addressbook-model.h"
 
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index c7798d5176..feaabbb53b 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -29,7 +29,7 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <table/e-table-scrolled.h>
 #include <table/e-table-model.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-gui-utils.h>
 #include <widgets/menus/gal-view-factory-etable.h>
 #include <widgets/menus/gal-view-etable.h>
 #include <e-util/e-xml-utils.h>
@@ -51,7 +51,7 @@
 #include <libedataserver/e-categories.h>
 
 #ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
-#include <widgets/misc/e-treeview-selection-model.h>
+#include <misc/e-treeview-selection-model.h>
 #include "gal-view-factory-treeview.h"
 #include "gal-view-treeview.h"
 #endif
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index cbea110b5e..737605a80f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -27,8 +27,8 @@
 #include "e-addressbook-model.h"
 #include "eab-contact-display.h"
 #include "widgets/menus/gal-view-menus.h"
-#include "widgets/misc/e-search-bar.h"
-#include "widgets/misc/e-filter-bar.h"
+#include "misc/e-search-bar.h"
+#include "misc/e-filter-bar.h"
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 3071e3737e..23021c31e1 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -29,8 +29,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <e-util/e-util.h>
 #include <text/e-text.h>
-#include <widgets/misc/e-canvas.h>
-#include <widgets/misc/e-canvas-utils.h>
+#include <misc/e-canvas.h>
+#include <misc/e-canvas-utils.h>
 #include <gdk/gdkkeysyms.h>
 
 static void e_minicard_label_init		(EMinicardLabel		 *card);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index c5bb37b81f..af59205eb8 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -22,8 +22,8 @@
 #include <config.h>
 
 #include <gtk/gtksignal.h>
-#include <widgets/misc/e-canvas-background.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas-background.h>
+#include <misc/e-canvas.h>
 #include <libgnome/gnome-i18n.h>
 
 #include "eab-marshal.h"
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index daa23e769c..65e690e6e8 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -20,7 +20,7 @@
 #ifndef __E_MINICARD_VIEW_WIDGET_H__
 #define __E_MINICARD_VIEW_WIDGET_H__
 
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas.h>
 #include <libebook/e-book.h>
 #include "e-minicard-view.h"
 
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 3dce38ab49..b362cb1294 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -30,7 +30,7 @@
 #include <gtk/gtkselection.h>
 #include <gtk/gtkdnd.h>
 #include <gdk/gdkkeysyms.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas.h>
 #include <libgnome/gnome-i18n.h>
 #include <string.h>
 
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 58987a4d99..e94e589dc1 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -22,8 +22,8 @@
 
 #include "e-minicard.h"
 
-#include <widgets/misc/e-reflow.h>
-#include <widgets/misc/e-selection-model-simple.h>
+#include <misc/e-reflow.h>
+#include <misc/e-selection-model-simple.h>
 #include <libebook/e-book.h>
 #include "e-addressbook-reflow-adapter.h"
 
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 3b64ebf66c..a1f84c4423 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -30,8 +30,8 @@
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <text/e-text.h>
 #include <e-util/e-util.h>
-#include <widgets/misc/e-canvas-utils.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas-utils.h>
+#include <misc/e-canvas.h>
 #include <libebook/e-book.h>
 #include "eab-marshal.h"
 #include "eab-gui-util.h"
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 0fab34effb..4a6ce2f470 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -32,7 +32,7 @@
 #include "util/eab-book-util.h"
 #include <libebook/e-destination.h>
 #include "e-util/e-error.h"
-#include "widgets/misc/e-image-chooser.h"
+#include "misc/e-image-chooser.h"
 #include <e-util/e-icon-factory.h>
 #include "eab-contact-merging.h"
 #include <gnome.h>
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index ae3256b7b8..16a5add922 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -54,9 +54,9 @@
 #include <gtk/gtkvbox.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libgnomeui/gnome-init.h>
-#include <widgets/misc/e-canvas.h>
-#include <widgets/misc/e-reflow.h>
-#include <widgets/misc/e-scroll-frame.h>
+#include <misc/e-canvas.h>
+#include <misc/e-reflow.h>
+#include <misc/e-scroll-frame.h>
 
 #include "e-minicard.h"