[monkey-bubble: 145/753] Fixed #includes for libgnomebase.

[Sven Herzberg <herzi src gnome org>]

commit 4d13e0383f4f2dada46e5077c5d715ac76fe6d45
Author: Martin Baulig <martin src gnome org>
Date:   Sun Apr 15 14:54:47 2001 +0000

    Fixed #includes for libgnomebase.

 libgnome/gnome-config.h      |    2 +-
 libgnome/gnome-ditem.c       |    4 ++--
 libgnome/gnome-ditem.h       |    2 +-
 libgnome/gnome-exec.c        |    4 ++--
 libgnome/gnome-exec.h        |    2 +-
 libgnome/gnome-fileconvert.c |    2 +-
 libgnome/gnome-fileconvert.h |    2 +-
 libgnome/gnome-paper.h       |    2 +-
 libgnome/gnome-regex.h       |    2 +-
 libgnome/gnome-remote.h      |    2 +-
 libgnome/gnome-sound.h       |    2 +-
 libgnome/gnome-triggers.h    |    2 +-
 libgnome/gnome-url.c         |    4 ++--
 libgnome/gnome-url.h         |    2 +-
 libgnome/gnome-util.c        |    8 ++++----
 libgnome/gnome-util.h        |    4 ++--
 libgnome/libgnome.h          |    6 +-----
 libgnome/libgnomeP.h         |    7 ++++---
 18 files changed, 28 insertions(+), 31 deletions(-)
---
diff --git a/libgnome/gnome-config.h b/libgnome/gnome-config.h
index b307f39..4bdc77c 100644
--- a/libgnome/gnome-config.h
+++ b/libgnome/gnome-config.h
@@ -27,7 +27,7 @@
 #define GNOME_CONFIG_H
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-ditem.c b/libgnome/gnome-ditem.c
index 5286156..49e8585 100644
--- a/libgnome/gnome-ditem.c
+++ b/libgnome/gnome-ditem.c
@@ -42,8 +42,8 @@
 #include <time.h>
 #include <string.h>
 #include "libgnomeP.h"
-#include "gnome-defs.h"
-#include "gnome-portability.h"
+#include <libgnomebase/gnome-defs.h>
+#include <libgnomebase/gnome-portability.h>
 #include "gnome-ditem.h"
 #include "gnome-util.h"
 #include "gnome-config.h"
diff --git a/libgnome/gnome-ditem.h b/libgnome/gnome-ditem.h
index 83996f2..501b83a 100644
--- a/libgnome/gnome-ditem.h
+++ b/libgnome/gnome-ditem.h
@@ -28,7 +28,7 @@
 #define GNOME_DITEM_H
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-exec.c b/libgnome/gnome-exec.c
index 111788d..ff8dc6a 100644
--- a/libgnome/gnome-exec.c
+++ b/libgnome/gnome-exec.c
@@ -25,9 +25,9 @@
 #  include <config.h>
 #endif
 
-#include "gnome-defs.h"
+#include <libgnomebase/gnome-defs.h>
 #include "gnome-exec.h"
-#include "gnome-portability.h"
+#include <libgnomebase/gnome-portability.h>
 #include "gnome-util.h"
 #include "gnome-config.h"
 #include "gnome-i18nP.h"
diff --git a/libgnome/gnome-exec.h b/libgnome/gnome-exec.h
index 1a9efb4..6ba2c11 100644
--- a/libgnome/gnome-exec.h
+++ b/libgnome/gnome-exec.h
@@ -28,7 +28,7 @@
 #define GNOME_EXEC_H
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-fileconvert.c b/libgnome/gnome-fileconvert.c
index c304990..0ec9e0f 100644
--- a/libgnome/gnome-fileconvert.c
+++ b/libgnome/gnome-fileconvert.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <dirent.h>
 
-#include "gnome-defs.h"
+#include <libgnomebase/gnome-defs.h>
 #include "gnome-fileconvert.h"
 #include "gnome-util.h"
 #include "libgnomeP.h"
diff --git a/libgnome/gnome-fileconvert.h b/libgnome/gnome-fileconvert.h
index 4bc5088..d3c18b5 100644
--- a/libgnome/gnome-fileconvert.h
+++ b/libgnome/gnome-fileconvert.h
@@ -27,7 +27,7 @@
 #define __GNOME_FILECONVERT_H__ 1
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 /* WARNING ____ IMMATURE API ____ liable to change */
 
diff --git a/libgnome/gnome-paper.h b/libgnome/gnome-paper.h
index 51bd73a..4c4ea66 100644
--- a/libgnome/gnome-paper.h
+++ b/libgnome/gnome-paper.h
@@ -28,7 +28,7 @@
 #define GNOME_PAPER_H
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-regex.h b/libgnome/gnome-regex.h
index 380dda5..481a938 100644
--- a/libgnome/gnome-regex.h
+++ b/libgnome/gnome-regex.h
@@ -24,7 +24,7 @@
 #ifndef GNOME_REGEX_H
 #define GNOME_REGEX_H
 
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-remote.h b/libgnome/gnome-remote.h
index da161a0..7b6d82f 100644
--- a/libgnome/gnome-remote.h
+++ b/libgnome/gnome-remote.h
@@ -25,7 +25,7 @@
 #define GNOME_REMOTE_H
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-sound.h b/libgnome/gnome-sound.h
index 1071f75..326effe 100644
--- a/libgnome/gnome-sound.h
+++ b/libgnome/gnome-sound.h
@@ -27,7 +27,7 @@
 #define __GNOME_SOUND_H__ 1
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-triggers.h b/libgnome/gnome-triggers.h
index 1ca42fc..14cb167 100644
--- a/libgnome/gnome-triggers.h
+++ b/libgnome/gnome-triggers.h
@@ -27,7 +27,7 @@
 #define __GNOME_TRIGGERS_H__
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-url.c b/libgnome/gnome-url.c
index fa4c7de..25338ab 100644
--- a/libgnome/gnome-url.c
+++ b/libgnome/gnome-url.c
@@ -31,11 +31,11 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-util.h>
-#include <libgnome/gnome-portability.h>
+#include <libgnomebase/gnome-portability.h>
 #include "gnome-url.h"
 #include "gnome-i18nP.h"
 #include <popt.h>
diff --git a/libgnome/gnome-url.h b/libgnome/gnome-url.h
index 61866d4..7bc5005 100644
--- a/libgnome/gnome-url.h
+++ b/libgnome/gnome-url.h
@@ -25,7 +25,7 @@
 #define GNOME_URL_H
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomebase/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/gnome-util.c b/libgnome/gnome-util.c
index c741fab..1ecfded 100644
--- a/libgnome/gnome-util.c
+++ b/libgnome/gnome-util.c
@@ -50,10 +50,10 @@
 #include <pwd.h>
 #include <limits.h>
 #include "libgnomeP.h"
-#include "gnome-portability.h"
-#include "gnome-defs.h"
-#include "gnome-util.h"
-#include "gnome-program.h"
+#include <libgnomebase/gnome-defs.h>
+#include <libgnomebase/gnome-program.h>
+#include <libgnomebase/gnome-portability.h>
+#include <libgnome/gnome-util.h>
 
 /**
  * g_concat_dir_and_file:
diff --git a/libgnome/gnome-util.h b/libgnome/gnome-util.h
index 8d42338..8242435 100644
--- a/libgnome/gnome-util.h
+++ b/libgnome/gnome-util.h
@@ -29,8 +29,8 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include "gnome-defs.h"
-#include "gnome-program.h"
+#include <libgnomebase/gnome-defs.h>
+#include <libgnomebase/gnome-program.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/libgnome/libgnome.h b/libgnome/libgnome.h
index 8f092ec..c4a2aab 100644
--- a/libgnome/libgnome.h
+++ b/libgnome/libgnome.h
@@ -26,14 +26,10 @@
 #ifndef LIBGNOME_H
 #define LIBGNOME_H
 
-#include <libgnome/gnome-portability.h>
-#include <libgnome/gnome-defs.h>
-
-#include <libgnome/gnome-program.h>
+#include <libgnomebase/libgnomebase.h>
 
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-i18n.h>
 
 /* Should this be in gnome-print? */
 #include <libgnome/gnome-paper.h>
diff --git a/libgnome/libgnomeP.h b/libgnome/libgnomeP.h
index 25d16d2..9c4e0da 100644
--- a/libgnome/libgnomeP.h
+++ b/libgnome/libgnomeP.h
@@ -27,9 +27,10 @@
 #define LIBGNOMEP_H
 
 #include <glib.h>
-#include "libgnome/gnome-defs.h"
-#include "libgnome/gnome-i18nP.h"
-#include "libgnome/libgnome.h"
+#include <libgnomebase/libgnomebase.h>
+#include <libgnome/libgnome.h>
+
+#include "gnome-i18nP.h"
 
 #define PATH_SEP '/'
 #define PATH_SEP_STR "/"