From df07f02cae503795461bd231da20805853430da7 Mon Sep 17 00:00:00 2001
From: Kaushal Kumar <kakumar@novell.com>
Date: Thu, 23 Jun 2005 09:11:11 +0000
Subject: 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
---
 widgets/misc/ChangeLog                  | 6 ++++++
 widgets/misc/Makefile.am                | 2 +-
 widgets/misc/e-activity-handler.c       | 2 +-
 widgets/misc/e-calendar.h               | 2 +-
 widgets/misc/e-canvas-background.c      | 6 +++---
 widgets/misc/e-reflow.c                 | 2 +-
 widgets/misc/e-reflow.h                 | 4 ++--
 widgets/misc/e-search-bar.c             | 4 ++--
 widgets/misc/e-selection-model-array.h  | 2 +-
 widgets/misc/e-selection-model-simple.h | 2 +-
 widgets/misc/e-task-bar.c               | 2 +-
 widgets/misc/gal-combo-text.h           | 2 +-
 12 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'widgets/misc')

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index abf787ea78..b259d2595d 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-23  Kaushal Kumar  <kakumar@novell.com>
+
+	* Makefile.am: Use 'misc' for widgetsincludedir, instead of 
+	'widgets', to match source directory name and fix 
+	evolution-exchange build.
+
 2005-05-31  Li Yuan  <li.yuan@sun.com>
 
 	* e-dateedit.c:(e_date_edit_update_date_entry):
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 73095b8432..042bdf5699 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -16,7 +16,7 @@ privlib_LTLIBRARIES =		\
 	libemiscwidgets.la	\
 	libefilterbar.la
 
-widgetsincludedir = $(privincludedir)/widgets
+widgetsincludedir = $(privincludedir)/misc
 
 if ENABLE_PILOT_CONDUITS
 pilot_sources = e-pilot-settings.c
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 8a5e129300..8274df5556 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -32,7 +32,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-popup-menu.h>
 
-#include <widgets/misc/e-popup-menu.h>
+#include <misc/e-popup-menu.h>
 
 #define ICON_SIZE 16
 
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index a9a0cad6d0..6ad4df1150 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -24,7 +24,7 @@
 #define _E_CALENDAR_H_
 
 #include <gtk/gtkwidget.h>
-#include <widgets/misc/e-canvas.h>
+#include <misc/e-canvas.h>
 #include "e-calendar-item.h"
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 569fe2b783..d0d1479e37 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -32,9 +32,9 @@
 
 #include "e-util/e-i18n.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-canvas.h"
-#include "widgets/misc/e-canvas-utils.h"
-#include "widgets/misc/e-hsv-utils.h"
+#include "misc/e-canvas.h"
+#include "misc/e-canvas-utils.h"
+#include "misc/e-hsv-utils.h"
 
 #include "e-canvas-background.h"
 
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 90eb9864a6..df36dd81be 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -33,7 +33,7 @@
 #include "e-util/e-i18n.h"
 #include "e-util-marshal.h"
 #include "e-util/e-util.h"
-#include "widgets/misc/e-unicode.h"
+#include "misc/e-unicode.h"
 
 #include "e-canvas.h"
 #include "e-canvas-utils.h"
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
index f69abaf111..bbf012c511 100644
--- a/widgets/misc/e-reflow.h
+++ b/widgets/misc/e-reflow.h
@@ -25,8 +25,8 @@
 #define __E_REFLOW_H__
 
 #include <libgnomecanvas/gnome-canvas.h>
-#include <widgets/misc/e-reflow-model.h>
-#include <widgets/misc/e-selection-model.h>
+#include <misc/e-reflow-model.h>
+#include <misc/e-selection-model.h>
 #include <e-util/e-sorter-array.h>
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 5a7bac4edc..d957da1d04 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -36,8 +36,8 @@
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtkmain.h>
 
-#include <widgets/misc/e-unicode.h>
-#include <widgets/misc/e-gui-utils.h>
+#include <misc/e-unicode.h>
+#include <misc/e-gui-utils.h>
 
 #include <libgnome/gnome-i18n.h>
 
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
index fd5255e308..98dd6a300d 100644
--- a/widgets/misc/e-selection-model-array.h
+++ b/widgets/misc/e-selection-model-array.h
@@ -25,7 +25,7 @@
 #define _E_SELECTION_MODEL_ARRAY_H_
 
 #include <gtk/gtkobject.h>
-#include <widgets/misc/e-selection-model.h>
+#include <misc/e-selection-model.h>
 #include <e-util/e-bit-array.h>
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h
index 00b8c3a781..afd7858366 100644
--- a/widgets/misc/e-selection-model-simple.h
+++ b/widgets/misc/e-selection-model-simple.h
@@ -24,7 +24,7 @@
 #ifndef _E_SELECTION_MODEL_SIMPLE_H_
 #define _E_SELECTION_MODEL_SIMPLE_H_
 
-#include <widgets/misc/e-selection-model-array.h>
+#include <misc/e-selection-model-array.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c
index 3ed243e18f..2e28a6c76a 100644
--- a/widgets/misc/e-task-bar.c
+++ b/widgets/misc/e-task-bar.c
@@ -26,7 +26,7 @@
 
 #include "e-task-bar.h"
 
-#include "widgets/misc/e-clipped-label.h"
+#include "misc/e-clipped-label.h"
 
 struct _ETaskBarPrivate
 {
diff --git a/widgets/misc/gal-combo-text.h b/widgets/misc/gal-combo-text.h
index f53d924c5a..82580b6f6e 100644
--- a/widgets/misc/gal-combo-text.h
+++ b/widgets/misc/gal-combo-text.h
@@ -23,7 +23,7 @@
 #ifndef _GAL_COMBO_TEXT_H
 #define _GAL_COMBO_TEXT_H
 
-#include <widgets/misc/gal-combo-box.h>
+#include <misc/gal-combo-box.h>
 
 #ifdef __cplusplus
 extern "C" {
-- 
cgit v1.2.3