Remove #include <glib.h> Shuffle some headers. Remove #include

2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>

	* e-corba-utils.h: Remove #include <glib.h>
	* e-dialog-widgets.c: Shuffle some headers.
	* e-dialog-widgets.h: Remove #include <libgnomeui/gnome-propertybox.h>
	* e-gtk-utils.c: #include <gtk/gtksignal.h>
	* e-gtk-utils.h: Replace #include <gtk/gtk.h>
	* e-gui-utils.c: Replace #include <gnome.h>
	* e-html-utils.c: Shuffle headers.
	* e-iterator.c: Replace #include <gtk/gtk.h>
	* e-iterator.h: Replace #include <gtk/gtk.h>
	* e-list-iterator.c: Remove #include <gtk/gtk.h>
	* e-list-iterator.h: Replace #include <gtk/gtk.h>
	* e-list.c: Remove #include <gtk/gtk.h>
	* e-list.h: Replace #include <gtk/gtk.h>
	* e-memory.c: #include <string.h> and <stdlib.h>
	* e-msgport.c: Move around some includes. s/%d/%ld/g in a printf()
	call to fix a warning.
	* e-pilot-map.c: #include <string.h>. Replace #include <gnome.h>
	* e-pilot-util.c: Remove #include <gnome.h>
	* e-sexp.c: Remove #include <glib.h>
	* e-sexp.h: Replace #include <gtk/gtk.h>
	* e-time-utils.c: #include <string.h>
	* md5-utils.c: Shuffle headers.
	* test-ename-western-gtk.c: Replace #include <gnome.h>
	* test-ename-western.c: Same here.

svn path=/trunk/; revision=9016

25 files changed, 77 insertions, 35 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index b566b4d3cc..8005acb99a 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,30 @@
+2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* e-corba-utils.h: Remove #include <glib.h>
+	* e-dialog-widgets.c: Shuffle some headers.
+	* e-dialog-widgets.h: Remove #include <libgnomeui/gnome-propertybox.h>
+	* e-gtk-utils.c: #include <gtk/gtksignal.h>
+	* e-gtk-utils.h: Replace #include <gtk/gtk.h>
+	* e-gui-utils.c: Replace #include <gnome.h>
+	* e-html-utils.c: Shuffle headers.
+	* e-iterator.c: Replace #include <gtk/gtk.h>
+	* e-iterator.h: Replace #include <gtk/gtk.h>
+	* e-list-iterator.c: Remove #include <gtk/gtk.h>
+	* e-list-iterator.h: Replace #include <gtk/gtk.h>
+	* e-list.c: Remove #include <gtk/gtk.h>
+	* e-list.h: Replace #include <gtk/gtk.h>
+	* e-memory.c: #include <string.h> and <stdlib.h>
+	* e-msgport.c: Move around some includes. s/%d/%ld/g in a printf()
+	call to fix a warning.
+	* e-pilot-map.c: #include <string.h>. Replace #include <gnome.h>
+	* e-pilot-util.c: Remove #include <gnome.h>
+	* e-sexp.c: Remove #include <glib.h>
+	* e-sexp.h: Replace #include <gtk/gtk.h>
+	* e-time-utils.c: #include <string.h>
+	* md5-utils.c: Shuffle headers.
+	* test-ename-western-gtk.c: Replace #include <gnome.h>
+	* test-ename-western.c: Same here.
+	
 2001-03-20  Radek Doulik  <rodo@ximian.com>
 
 	* e-html-utils.c (e_text_to_html_full): new function, extracted
diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
index 327026087a..2147b8df37 100644
--- a/e-util/e-corba-utils.h
+++ b/e-util/e-corba-utils.h
@@ -23,7 +23,6 @@
 #ifndef E_CORBA_UTILS_H
 #define E_CORBA_UTILS_H
 
-#include <glib.h>
 #include <orb/orbit.h>
 
 const CORBA_char *e_safe_corba_string (const char *s);
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index 380bc0d3a8..570a7e7882 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+
 #include <math.h>
 #include <string.h>
 #include <time.h>
@@ -31,9 +32,11 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkspinbutton.h>
 #include <libgnomeui/gnome-dateedit.h>
-#include "e-dialog-widgets.h"
+#include <libgnomeui/gnome-propertybox.h>
 #include <gal/widgets/e-unicode.h>
 
+#include "e-dialog-widgets.h"
+
 
 
 /* A widget, a pointer to the variable it will modify, and extra information */
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
index 7b20218fff..15ed8ab24e 100644
--- a/e-util/e-dialog-widgets.h
+++ b/e-util/e-dialog-widgets.h
@@ -25,7 +25,6 @@
 
 #include <time.h>
 #include <glade/glade.h>
-#include <libgnomeui/gnome-propertybox.h>
 
 
 
diff --git a/e-util/e-gtk-utils.c b/e-util/e-gtk-utils.c
index c00ca4c8ef..c1a258ea14 100644
--- a/e-util/e-gtk-utils.c
+++ b/e-util/e-gtk-utils.c
@@ -26,6 +26,7 @@
 #include <config.h>
 #endif
 
+#include <gtk/gtksignal.h>
 #include "e-gtk-utils.h"
 
 
diff --git a/e-util/e-gtk-utils.h b/e-util/e-gtk-utils.h
index 0bbee2910a..d56d8a9000 100644
--- a/e-util/e-gtk-utils.h
+++ b/e-util/e-gtk-utils.h
@@ -24,7 +24,8 @@
 #ifndef E_GTK_UTILS_H
 #define E_GTK_UTILS_H
 
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
+#include <gtk/gtkradiobutton.h>
 
 void  e_gtk_signal_connect_full_while_alive  (GtkObject          *object,
 					      const char         *name,
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index 3ce7110fff..356ed41cc0 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -9,12 +9,16 @@
  * (C) 2000 Helix Code, Inc.
  */
 #include <config.h>
+
 #include <gtk/gtksignal.h>
-#include <gnome.h>
-#include "e-gui-utils.h"
+#include <gtk/gtkalignment.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
 
+#include "e-gui-utils.h"
+
 GtkWidget *e_create_image_widget(gchar *name,
 				 gchar *string1, gchar *string2,
 				 gint int1, gint int2)
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index f0c16e63a0..5afb0a6319 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -19,13 +19,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "e-html-utils.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
 #include <unicode.h>
 
+#include "e-html-utils.h"
+
 static char *
 check_size (char **buffer, int *buffer_size, char *out, int len)
 {
diff --git a/e-util/e-iterator.c b/e-util/e-iterator.c
index 874d05ccea..fb0b3142c8 100644
--- a/e-util/e-iterator.c
+++ b/e-util/e-iterator.c
@@ -8,8 +8,8 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
 
+#include <gtk/gtksignal.h>
 #include "e-iterator.h"
 
 #define ECI_CLASS(object) (E_ITERATOR_CLASS(GTK_OBJECT((object))->klass))
diff --git a/e-util/e-iterator.h b/e-util/e-iterator.h
index 84a2db142b..667e141686 100644
--- a/e-util/e-iterator.h
+++ b/e-util/e-iterator.h
@@ -10,9 +10,9 @@
 #ifndef __E_ITERATOR_H__
 #define __E_ITERATOR_H__
 
-#include <time.h>
-#include <gtk/gtk.h>
 #include <stdio.h>
+#include <time.h>
+#include <gtk/gtkobject.h>
 
 #define E_TYPE_ITERATOR            (e_iterator_get_type ())
 #define E_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ITERATOR, EIterator))
diff --git a/e-util/e-list-iterator.c b/e-util/e-list-iterator.c
index d53a155cf8..b6e5a7018a 100644
--- a/e-util/e-list-iterator.c
+++ b/e-util/e-list-iterator.c
@@ -8,11 +8,11 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
 
 #include "e-list-iterator.h"
 #include "e-list.h"
 
+
 static void        e_list_iterator_init       (EListIterator *list);
 static void        e_list_iterator_class_init (EListIteratorClass *klass);
 		   
diff --git a/e-util/e-list-iterator.h b/e-util/e-list-iterator.h
index a2b7d82988..1c6f7c6ca8 100644
--- a/e-util/e-list-iterator.h
+++ b/e-util/e-list-iterator.h
@@ -13,9 +13,10 @@
 typedef struct _EListIterator EListIterator;
 typedef struct _EListIteratorClass EListIteratorClass;
 
-#include <time.h>
-#include <gtk/gtk.h>
 #include <stdio.h>
+#include <time.h>
+#include <gtk/gtkobject.h>
+
 #include <e-util/e-iterator.h>
 #include <e-util/e-list.h>
 
diff --git a/e-util/e-list.c b/e-util/e-list.c
index 6fd0e559d5..9efe4503f7 100644
--- a/e-util/e-list.c
+++ b/e-util/e-list.c
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
 
 #include "e-list.h"
 #include "e-list-iterator.h"
diff --git a/e-util/e-list.h b/e-util/e-list.h
index 017f48d813..75a701dcf5 100644
--- a/e-util/e-list.h
+++ b/e-util/e-list.h
@@ -13,9 +13,9 @@
 typedef struct _EList EList;
 typedef struct _EListClass EListClass;
 
-#include <time.h>
-#include <gtk/gtk.h>
 #include <stdio.h>
+#include <time.h>
+#include <gtk/gtkobject.h>
 #include <e-util/e-list-iterator.h>
 
 #define E_TYPE_LIST            (e_list_get_type ())
diff --git a/e-util/e-memory.c b/e-util/e-memory.c
index 2e505785f6..0265088297 100644
--- a/e-util/e-memory.c
+++ b/e-util/e-memory.c
@@ -20,9 +20,12 @@
 
 */
 
-#include "e-memory.h"
+#include <string.h> /* memset() */
+#include <stdlib.h> /* alloca() */
 #include <glib.h>
 
+#include "e-memory.h"
+
 #define s(x)			/* strv debug */
 
 /*#define TIMEIT*/
diff --git a/e-util/e-msgport.c b/e-util/e-msgport.c
index eb6e07e24f..d7e3e02776 100644
--- a/e-util/e-msgport.c
+++ b/e-util/e-msgport.c
@@ -1,18 +1,17 @@
 
-
-#include <glib.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-
 #include <stdio.h>
 
-#include "e-msgport.h"
-
 #include <pthread.h>
 
+#include <glib.h>
+
+#include "e-msgport.h"
+
 #define m(x)			/* msgport debug */
 #define t(x) 			/* thread debug */
 
@@ -357,7 +356,7 @@ void e_thread_destroy(EThread *e)
 			info = e->id_list->data;
 			if (!info->busy) {
 				e->id_list = g_list_remove(e->id_list, info);
-				printf("cleaning up pool thread %d\n", info->id);
+				printf("cleaning up pool thread %ld\n", info->id);
 				pthread_mutex_unlock(&e->mutex);
 				if (pthread_cancel(info->id) == 0)
 					pthread_join(info->id, 0);
diff --git a/e-util/e-path.c b/e-util/e-path.c
index 961be21bd6..0728c94013 100644
--- a/e-util/e-path.c
+++ b/e-util/e-path.c
@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include <glib.h>
+
 #include "e-path.h"
 
 #define SUBFOLDER_DIR_NAME     "subfolders"
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
index 67aacdcf2a..87eba7020e 100644
--- a/e-util/e-pilot-map.c
+++ b/e-util/e-pilot-map.c
@@ -20,11 +20,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <string.h> /* memset(), strcmp() */
 #include <stdlib.h>
-#include <time.h>
-#include <gnome.h>
 #include <gnome-xml/parser.h>
-#include <e-pilot-map.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
+
+#include "e-pilot-map.h"
 
 typedef struct 
 {
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
index 0f91f48e3a..10622506e6 100644
--- a/e-util/e-pilot-util.c
+++ b/e-util/e-pilot-util.c
@@ -22,10 +22,10 @@
 
 #include <stdlib.h>
 #include <time.h>
-#include <gnome.h>
 #include <gnome-xml/parser.h>
 #include <pi-util.h>
-#include <e-pilot-util.h>
+
+#include "e-pilot-util.h"
 
 char *
 e_pilot_utf8_to_pchar (const char *string)
diff --git a/e-util/e-sexp.c b/e-util/e-sexp.c
index 69e1c0ca15..a1eb51cf01 100644
--- a/e-util/e-sexp.c
+++ b/e-util/e-sexp.c
@@ -67,7 +67,6 @@
         Execute a sequence.  The last function return is the return type.
 */
 
-#include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/e-util/e-sexp.h b/e-util/e-sexp.h
index 9299fdb61a..668788f788 100644
--- a/e-util/e-sexp.h
+++ b/e-util/e-sexp.h
@@ -4,11 +4,11 @@
 #ifndef _E_SEXP_H
 #define _E_SEXP_H
 
-#include <glib.h>
 #include <setjmp.h>
+#include <glib.h>
 
 #ifdef E_SEXP_IS_GTK_OBJECT
-#include <gtk/gtk.h>
+#include <gtk/gtkobject.h>
 #endif
 
 #ifdef E_SEXP_IS_GTK_OBJECT
diff --git a/e-util/e-time-utils.c b/e-util/e-time-utils.c
index de68939f31..5c2496051c 100644
--- a/e-util/e-time-utils.c
+++ b/e-util/e-time-utils.c
@@ -18,6 +18,7 @@
 #undef _XOPEN_SOURCE
 #undef __USE_XOPEN
 
+#include <string.h>
 #include <ctype.h>
 #include <glib.h>
 #include <libgnome/gnome-defs.h>
diff --git a/e-util/ename/test-ename-western-gtk.c b/e-util/ename/test-ename-western-gtk.c
index 74adb2a0b4..d36b12ab37 100644
--- a/e-util/ename/test-ename-western-gtk.c
+++ b/e-util/ename/test-ename-western-gtk.c
@@ -1,4 +1,5 @@
-#include <gnome.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-init.h>
 #include <gal/widgets/e-unicode.h>
 #include <ename/e-name-western.h>
 
diff --git a/e-util/ename/test-ename-western.c b/e-util/ename/test-ename-western.c
index 6d3beaf16f..3ac655aa22 100644
--- a/e-util/ename/test-ename-western.c
+++ b/e-util/ename/test-ename-western.c
@@ -1,6 +1,7 @@
-#include <gnome.h>
 #include <ctype.h>
-
+#include <stdio.h>
+#include <glib.h>
+#include <libgnome/gnome-defs.h>
 #include <ename/e-name-western.h>
 
 static void
diff --git a/e-util/md5-utils.c b/e-util/md5-utils.c
index a4dd42af8b..368a3c1828 100644
--- a/e-util/md5-utils.c
+++ b/e-util/md5-utils.c
@@ -23,9 +23,9 @@
  */
 
 
-#include "md5-utils.h"
 #include <stdio.h>
 #include <string.h>
+#include "md5-utils.h"
 
 static void md5_transform (guint32 buf[4], const guint32 in[16]);