Compilation touchups -miguel

svn path=/trunk/; revision=1537

33 files changed, 34 insertions, 29 deletions

diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 0d671105d3..88bc5d142a 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,3 +1,5 @@
+INCLUDES =					\
+	$(GNOME_INCLUDEDIR)
 
 noinst_LIBRARIES = libeutil.a
 
diff --git a/widgets/LICENSE b/widgets/LICENSE
new file mode 100644
index 0000000000..b1f6ae08a4
--- /dev/null
+++ b/widgets/LICENSE
@@ -0,0 +1 @@
+This code is released under the terms of the GNU GPL.
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index f8fd9b1c08..0408acc872 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,3 +1,3 @@
 
 SUBDIRS =	\
-	util meeting-time-sel shortcut-bar e-table
+	meeting-time-sel shortcut-bar e-table
diff --git a/widgets/e-table/LICENSE b/widgets/e-table/LICENSE
new file mode 100644
index 0000000000..b1f6ae08a4
--- /dev/null
+++ b/widgets/e-table/LICENSE
@@ -0,0 +1 @@
+This code is released under the terms of the GNU GPL.
diff --git a/widgets/e-table/e-cell-checkbox.c b/widgets/e-table/e-cell-checkbox.c
index d77e1fa4cd..431c1663d1 100644
--- a/widgets/e-table/e-cell-checkbox.c
+++ b/widgets/e-table/e-cell-checkbox.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-canvas.h>
 #include "e-cell-checkbox.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-item.h"
 
 #include "check-empty.xpm"
diff --git a/widgets/e-table/e-cell-text.c b/widgets/e-table/e-cell-text.c
index 9ce8190a14..fead3d4654 100644
--- a/widgets/e-table/e-cell-text.c
+++ b/widgets/e-table/e-cell-text.c
@@ -15,7 +15,7 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <stdio.h>
 #include "e-cell-text.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-item.h"
 
 #define PARENT_TYPE e_cell_get_type()
diff --git a/widgets/e-table/e-cell-toggle.c b/widgets/e-table/e-cell-toggle.c
index a933a62c49..679d04a0ca 100644
--- a/widgets/e-table/e-cell-toggle.c
+++ b/widgets/e-table/e-cell-toggle.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-canvas.h>
 #include "e-cell-toggle.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-item.h"
 
 #define PARENT_TYPE e_cell_get_type()
diff --git a/widgets/e-table/e-cell.c b/widgets/e-table/e-cell.c
index b5cbc0e850..f1345e8c6b 100644
--- a/widgets/e-table/e-cell.c
+++ b/widgets/e-table/e-cell.c
@@ -8,7 +8,7 @@
  */
 #include <config.h>
 #include "e-cell.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 
 #define PARENT_TYPE gtk_object_get_type()
 
diff --git a/widgets/e-table/e-table-col.c b/widgets/e-table/e-table-col.c
index 62a451ca4f..6f475158a5 100644
--- a/widgets/e-table/e-table-col.c
+++ b/widgets/e-table/e-table-col.c
@@ -10,7 +10,7 @@
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
 #include "e-table-col.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 
 #define PARENT_TYPE (gtk_object_get_type ())
 
diff --git a/widgets/e-table/e-table-group.c b/widgets/e-table/e-table-group.c
index 14c7a33f79..8783fbaa02 100644
--- a/widgets/e-table/e-table-group.c
+++ b/widgets/e-table/e-table-group.c
@@ -12,7 +12,7 @@
 #include "e-table-group.h"
 #include "e-table-item.h"
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 
 #define TITLE_HEIGHT         16
 #define GROUP_INDENT         10
diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c
index 7cea9ae7a0..5f23f06fa3 100644
--- a/widgets/e-table/e-table-header-item.c
+++ b/widgets/e-table/e-table-header-item.c
@@ -13,10 +13,10 @@
 #include <libgnomeui/gnome-canvas-util.h>
 #include <libgnomeui/gnome-canvas-polygon.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
+#include "e-util/e-cursors.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-col-dnd.h"
-#include "e-cursors.h"
 
 #include "add-col.xpm"
 #include "remove-col.xpm"
diff --git a/widgets/e-table/e-table-sorted.c b/widgets/e-table/e-table-sorted.c
index b559b3d87f..16644a45b1 100644
--- a/widgets/e-table/e-table-sorted.c
+++ b/widgets/e-table/e-table-sorted.c
@@ -8,7 +8,7 @@
  */
 #include <config.h>
 #include <stdlib.h>
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-sorted.h"
 
 #define PARENT_TYPE E_TABLE_SUBSET_TYPE
diff --git a/widgets/e-table/e-table-subset.c b/widgets/e-table/e-table-subset.c
index be4c7ab732..a9e4a5c5a4 100644
--- a/widgets/e-table/e-table-subset.c
+++ b/widgets/e-table/e-table-subset.c
@@ -9,7 +9,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <gtk/gtksignal.h>
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-subset.h"
 
 #define PARENT_TYPE E_TABLE_MODEL_TYPE
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index 730306b374..a42aaf111b 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <libgnomeui/gnome-canvas.h>
 #include <gtk/gtksignal.h>
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table.h"
 #include "e-table-header-item.h"
 #include "e-table-subset.h"
diff --git a/widgets/e-table/table-test.c b/widgets/e-table/table-test.c
index 9de673ede4..e18f38c5ec 100644
--- a/widgets/e-table/table-test.c
+++ b/widgets/e-table/table-test.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <gnome.h>
-#include "e-cursors.h"
+#include "e-util/e-cursors.h"
 #include "table-test.h"
 
 int
diff --git a/widgets/e-table/test-check.c b/widgets/e-table/test-check.c
index b24a7aff64..8cc5f6834e 100644
--- a/widgets/e-table/test-check.c
+++ b/widgets/e-table/test-check.c
@@ -12,7 +12,7 @@
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
-#include "e-cursors.h"
+#include "e-util/e-cursors.h"
 #include "e-cell-text.h"
 #include "e-cell-checkbox.h"
 
diff --git a/widgets/e-table/test-cols.c b/widgets/e-table/test-cols.c
index 6342a1739f..288e2bd408 100644
--- a/widgets/e-table/test-cols.c
+++ b/widgets/e-table/test-cols.c
@@ -8,11 +8,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
+#include "e-util/e-cursors.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
-#include "e-cursors.h"
 #include "e-cell-text.h"
 #include "e-cell-toggle.h"
 
diff --git a/widgets/e-table/test-table.c b/widgets/e-table/test-table.c
index 2e64826cba..053f81cfa6 100644
--- a/widgets/e-table/test-table.c
+++ b/widgets/e-table/test-table.c
@@ -8,11 +8,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
+#include "e-util/e-cursors.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
-#include "e-cursors.h"
 #include "e-cell-text.h"
 #include "e-table.h"
 
diff --git a/widgets/meeting-time-sel/LICENSE b/widgets/meeting-time-sel/LICENSE
new file mode 100644
index 0000000000..9babf4395f
--- /dev/null
+++ b/widgets/meeting-time-sel/LICENSE
@@ -0,0 +1 @@
+This code is licensed under the terms of the GNU GPL
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index d77e1fa4cd..431c1663d1 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-canvas.h>
 #include "e-cell-checkbox.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-item.h"
 
 #include "check-empty.xpm"
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 9ce8190a14..fead3d4654 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -15,7 +15,7 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <stdio.h>
 #include "e-cell-text.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-item.h"
 
 #define PARENT_TYPE e_cell_get_type()
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index a933a62c49..679d04a0ca 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-canvas.h>
 #include "e-cell-toggle.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-item.h"
 
 #define PARENT_TYPE e_cell_get_type()
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index b5cbc0e850..f1345e8c6b 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -8,7 +8,7 @@
  */
 #include <config.h>
 #include "e-cell.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 
 #define PARENT_TYPE gtk_object_get_type()
 
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 62a451ca4f..6f475158a5 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -10,7 +10,7 @@
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
 #include "e-table-col.h"
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 
 #define PARENT_TYPE (gtk_object_get_type ())
 
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 14c7a33f79..8783fbaa02 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -12,7 +12,7 @@
 #include "e-table-group.h"
 #include "e-table-item.h"
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 
 #define TITLE_HEIGHT         16
 #define GROUP_INDENT         10
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 7cea9ae7a0..5f23f06fa3 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -13,10 +13,10 @@
 #include <libgnomeui/gnome-canvas-util.h>
 #include <libgnomeui/gnome-canvas-polygon.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
+#include "e-util/e-cursors.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-col-dnd.h"
-#include "e-cursors.h"
 
 #include "add-col.xpm"
 #include "remove-col.xpm"
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index b559b3d87f..16644a45b1 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -8,7 +8,7 @@
  */
 #include <config.h>
 #include <stdlib.h>
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-sorted.h"
 
 #define PARENT_TYPE E_TABLE_SUBSET_TYPE
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index be4c7ab732..a9e4a5c5a4 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -9,7 +9,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <gtk/gtksignal.h>
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table-subset.h"
 
 #define PARENT_TYPE E_TABLE_MODEL_TYPE
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 730306b374..a42aaf111b 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <libgnomeui/gnome-canvas.h>
 #include <gtk/gtksignal.h>
-#include <e-util/e-util.h>
+#include "e-util/e-util.h"
 #include "e-table.h"
 #include "e-table-header-item.h"
 #include "e-table-subset.h"
diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c
index 9de673ede4..e18f38c5ec 100644
--- a/widgets/table/table-test.c
+++ b/widgets/table/table-test.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <gnome.h>
-#include "e-cursors.h"
+#include "e-util/e-cursors.h"
 #include "table-test.h"
 
 int
diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c
index b24a7aff64..8cc5f6834e 100644
--- a/widgets/table/test-check.c
+++ b/widgets/table/test-check.c
@@ -12,7 +12,7 @@
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
-#include "e-cursors.h"
+#include "e-util/e-cursors.h"
 #include "e-cell-text.h"
 #include "e-cell-checkbox.h"
 
diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c
index 6342a1739f..288e2bd408 100644
--- a/widgets/table/test-cols.c
+++ b/widgets/table/test-cols.c
@@ -8,11 +8,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
+#include "e-util/e-cursors.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
-#include "e-cursors.h"
 #include "e-cell-text.h"
 #include "e-cell-toggle.h"
 
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index 2e64826cba..053f81cfa6 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -8,11 +8,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
+#include "e-util/e-cursors.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
-#include "e-cursors.h"
 #include "e-cell-text.h"
 #include "e-table.h"