[ghex] Clean up ugly <gnome.h> includes (also see bug 590995)

[Andre Klapper <aklapper src gnome org>]

commit 0acf79f34092e48fb1eac8456606482713894740
Author: Andre Klapper <a9016009 gmx de>
Date:   Tue Jan 26 19:27:19 2010 +0100

    Clean up ugly <gnome.h> includes (also see bug 590995)

 src/chartable.c       |    1 +
 src/converter.c       |    3 ++-
 src/findreplace.c     |    1 +
 src/ghex-window.c     |    4 ++--
 src/ghex-window.h     |    1 -
 src/gtkhex.c          |    1 -
 src/hex-dialog.c      |    4 +++-
 src/hex-document-ui.c |    1 -
 src/hex-document.c    |    2 +-
 src/main.c            |    3 ++-
 src/preferences.c     |    2 ++
 src/print.c           |    2 +-
 src/session.h         |    2 +-
 src/ui.c              |    4 ++--
 14 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/src/chartable.c b/src/chartable.c
index 2584c1d..cbb9faa 100644
--- a/src/chartable.c
+++ b/src/chartable.c
@@ -26,6 +26,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <gtk/gtk.h>
+#include <libgnomeui/gnome-uidefs.h>
 
 #include "chartable.h"
 #include "ghex-window.h"
diff --git a/src/converter.c b/src/converter.c
index d75d97a..1f23494 100644
--- a/src/converter.c
+++ b/src/converter.c
@@ -27,10 +27,11 @@
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include <gnome.h>
 #include <ctype.h>      /* for isdigit */
 #include <string.h>     /* for strncpy */
 
+#include <libgnomeui/gnome-uidefs.h>
+
 #include "gtkhex.h"
 #include "converter.h"
 #include "ghex-window.h"
diff --git a/src/findreplace.c b/src/findreplace.c
index 8e431b8..93afdc2 100644
--- a/src/findreplace.c
+++ b/src/findreplace.c
@@ -26,6 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <libgnomeui/gnome-uidefs.h>
 
 #include "findreplace.h"
 #include "ui.h"
diff --git a/src/ghex-window.c b/src/ghex-window.c
index f7f8148..be2b40f 100644
--- a/src/ghex-window.c
+++ b/src/ghex-window.c
@@ -11,10 +11,9 @@
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include <gnome.h>
-
 #include <bonobo-activation/bonobo-activation.h>
 
+#include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-window-icon.h>
 
 #include <bonobo.h>
@@ -24,6 +23,7 @@
 
 #include <math.h>
 #include <ctype.h>
+#include <unistd.h> /* for F_OK */
 
 #include "ghex-window.h"
 #include "ui.h"
diff --git a/src/ghex-window.h b/src/ghex-window.h
index b8d1026..9a25989 100644
--- a/src/ghex-window.h
+++ b/src/ghex-window.h
@@ -10,7 +10,6 @@
 #ifndef __GHEX_WINDOW_H__
 #define __GHEX_WINDOW_H__
 
-#include <gnome.h>
 #include <bonobo-activation/bonobo-activation.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include <gconf/gconf-client.h>
diff --git a/src/gtkhex.c b/src/gtkhex.c
index 06a7675..48c1ec0 100644
--- a/src/gtkhex.c
+++ b/src/gtkhex.c
@@ -25,7 +25,6 @@
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include <gnome.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "hex-document.h"
diff --git a/src/hex-dialog.c b/src/hex-dialog.c
index d430165..c87a277 100644
--- a/src/hex-dialog.c
+++ b/src/hex-dialog.c
@@ -22,7 +22,9 @@
 #include <config.h>
 #include <glib-object.h>
 
-#include <gnome.h>
+#include <libgnomeui/gnome-uidefs.h>
+#include <glib/gi18n.h>
+
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/src/hex-document-ui.c b/src/hex-document-ui.c
index a8e27fa..15a4df8 100644
--- a/src/hex-document-ui.c
+++ b/src/hex-document-ui.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <gnome.h>
 
 #include "hex-document.h"
 #include "ghex-window.h"
diff --git a/src/hex-document.c b/src/hex-document.c
index dbcd208..cbd2361 100644
--- a/src/hex-document.c
+++ b/src/hex-document.c
@@ -23,10 +23,10 @@
 
 #include <config.h>
 #include <glib-object.h>
+#include <glib/gi18n.h>
 
 #include <gtkhex.h>
 #include <ghex-marshal.h>
-#include <gnome.h>
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/main.c b/src/main.c
index 78768d0..1ea5950 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,7 +23,8 @@
 
 #include <config.h>
 
-#include <gnome.h>
+#include <libgnomeui/gnome-client.h>
+#include <libgnomeui/gnome-ui-init.h>
 
 #include "session.h"
 #include "factory.h"
diff --git a/src/preferences.c b/src/preferences.c
index 42e4889..b3ca127 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -29,6 +29,8 @@
 
 #include <libgnomeprintui/gnome-font-dialog.h>
 
+#include <libgnomeui/gnome-uidefs.h>
+
 #include "gnome-print-font-picker.h"
 #include "preferences.h"
 #include "configuration.h"
diff --git a/src/print.c b/src/print.c
index dcc73d6..c228fcf 100644
--- a/src/print.c
+++ b/src/print.c
@@ -27,7 +27,7 @@
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include <libgnomeprintui/gnome-print-dialog.h>
 
diff --git a/src/session.h b/src/session.h
index 7bca8d4..e77f4a5 100644
--- a/src/session.h
+++ b/src/session.h
@@ -24,7 +24,7 @@
 #ifndef __GHEX_SESSION_H__
 #define __GHEX_SESSION_H__
 
-#include <gnome.h>
+#include <libgnomeui/gnome-client.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ui.c b/src/ui.c
index 6d90503..fa8c0ea 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -22,13 +22,13 @@
 */
 
 #include <config.h>
-#include <gnome.h>
 #include <string.h>
+#include <unistd.h> /* for F_OK and W_OK */
 
+#include <gtk/gtkaboutdialog.h>
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-job-preview.h>
-#include <gtk/gtkaboutdialog.h>
 
 #include "ui.h"
 #include "ghex-window.h"