[gok] Cleanup <gnome.h> includes. Fixes bug #588877.
- From: Andre Klapper <aklapper src gnome org>
- To: svn-commits-list gnome org
- Subject: [gok] Cleanup <gnome.h> includes. Fixes bug #588877.
- Date: Mon, 20 Jul 2009 10:55:49 +0000 (UTC)
commit 4b405e5a308862c18a6c8838669da2fcd6cc593f
Author: Andre Klapper <a9016009 gmx de>
Date: Mon Jul 20 12:54:35 2009 +0200
Cleanup <gnome.h> includes. Fixes bug #588877.
configure.in | 1 +
gok/callbacks.c | 3 ++-
gok/callbacks.h | 1 -
gok/command-graph.c | 1 +
gok/command-graph.h | 1 -
gok/gok-action.c | 1 +
gok/gok-action.h | 2 --
gok/gok-bounds.c | 2 +-
gok/gok-chunker.h | 1 -
gok/gok-control.c | 2 ++
gok/gok-control.h | 2 +-
gok/gok-editor.c | 3 ++-
gok/gok-feedback.h | 1 -
gok/gok-glade-helpers.c | 1 -
gok/gok-input.c | 4 ++--
gok/gok-key.c | 4 +++-
gok/gok-key.h | 2 +-
gok/gok-keyboard.c | 2 ++
gok/gok-keyboard.h | 1 -
gok/gok-modifier-keymasks.h | 2 +-
gok/gok-modifier.h | 1 -
gok/gok-output.h | 1 -
gok/gok-page-accessmethod.h | 1 -
gok/gok-page-actions.c | 2 ++
gok/gok-page-actions.h | 1 -
gok/gok-page-feedbacks.c | 2 ++
gok/gok-page-feedbacks.h | 1 -
gok/gok-page-keyboard.c | 3 +++
gok/gok-page-keyboard.h | 2 --
gok/gok-page-keysizespace.c | 2 ++
gok/gok-page-keysizespace.h | 2 --
gok/gok-page-wordcomplete.h | 2 --
gok/gok-repeat.h | 1 -
gok/gok-scanner.c | 2 ++
gok/gok-settings-dialog.c | 1 -
gok/gok-settings-dialog.h | 1 -
gok/gok-sliding-window-word-complete.c | 2 +-
gok/gok-speech.c | 1 -
gok/gok-spy.c | 2 ++
gok/gok-utf8-word-complete.c | 4 +++-
gok/gok-windowlister.c | 2 ++
gok/gok-word-complete.c | 1 +
gok/main.c | 4 +++-
gok/test-gok-action.c | 3 ++-
gok/test-gok-bounds.c | 2 +-
gok/test-gok-feedback.c | 2 +-
gok/test-gok-wordcomplete.c | 2 +-
gok/word-complete.c | 2 +-
48 files changed, 49 insertions(+), 40 deletions(-)
---
diff --git a/configure.in b/configure.in
index 4e81fbe..13702c0 100644
--- a/configure.in
+++ b/configure.in
@@ -162,6 +162,7 @@ GTK_DOC_CHECK([1.0])
dnl Checks for libraries
PKG_CHECK_MODULES(GOK, \
glib-2.0 >= 2.17.4 \
+ libgnome-2.0 >= 2.0.0 \
libgnomeui-2.0 >= 2.0.0 \
cspi-1.0 >= 1.5.0 \
libspi-1.0 >= 1.5.0 \
diff --git a/gok/callbacks.c b/gok/callbacks.c
index 32bef65..fe16537 100644
--- a/gok/callbacks.c
+++ b/gok/callbacks.c
@@ -23,8 +23,9 @@
# include <config.h>
#endif
-#include <gnome.h>
#include <gdk/gdkx.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#ifdef HAVE_XINPUT
#include <X11/extensions/XInput.h>
#endif
diff --git a/gok/callbacks.h b/gok/callbacks.h
index dc6579a..ed02ee0 100644
--- a/gok/callbacks.h
+++ b/gok/callbacks.h
@@ -1,4 +1,3 @@
-#include <gnome.h>
void
diff --git a/gok/command-graph.c b/gok/command-graph.c
index 573b929..078db4c 100644
--- a/gok/command-graph.c
+++ b/gok/command-graph.c
@@ -23,6 +23,7 @@
# include <config.h>
#endif
+#include <glib.h>
#include "command-graph.h"
/*
diff --git a/gok/command-graph.h b/gok/command-graph.h
index 106a04f..8669af0 100644
--- a/gok/command-graph.h
+++ b/gok/command-graph.h
@@ -26,7 +26,6 @@
#include "global.h"
#include "arraylist.h"
#include "command-vertex.h"
-#include "gnome.h"
/*
diff --git a/gok/gok-action.c b/gok/gok-action.c
index d7a4e63..f47fc36 100644
--- a/gok/gok-action.c
+++ b/gok/gok-action.c
@@ -23,6 +23,7 @@
# include <config.h>
#endif
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <gconf/gconf-client.h>
diff --git a/gok/gok-action.h b/gok/gok-action.h
index 4a15855..e29f7da 100644
--- a/gok/gok-action.h
+++ b/gok/gok-action.h
@@ -22,8 +22,6 @@
#ifndef __GOKACTION_H__
#define __GOKACTION_H__
-#include <gnome.h>
-
/* different types of actions (keep these as bit values) */
#define ACTION_TYPE_SWITCH 1
#define ACTION_TYPE_MOUSEBUTTON 2
diff --git a/gok/gok-bounds.c b/gok/gok-bounds.c
index 3f5ad32..9b6657c 100644
--- a/gok/gok-bounds.c
+++ b/gok/gok-bounds.c
@@ -22,7 +22,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#include <gnome.h>
+#include <glib.h>
/**
* gok_bounds_get_upper_left:
diff --git a/gok/gok-chunker.h b/gok/gok-chunker.h
index d5baa99..6a7e7d3 100644
--- a/gok/gok-chunker.h
+++ b/gok/gok-chunker.h
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <gnome.h>
#include "gok-key.h"
#include "gok-button.h"
diff --git a/gok/gok-control.c b/gok/gok-control.c
index 9f8a96d..49848b3 100644
--- a/gok/gok-control.c
+++ b/gok/gok-control.c
@@ -23,6 +23,8 @@
# include <config.h>
#endif
+#include <glib.h>
+#include <glib/gi18n.h>
#include "gok-control.h"
#include "gok-settings-dialog.h"
#include "gok-log.h"
diff --git a/gok/gok-control.h b/gok/gok-control.h
index 7a71447..585d4ed 100644
--- a/gok/gok-control.h
+++ b/gok/gok-control.h
@@ -22,7 +22,7 @@
#ifndef __GOKCONTROL_H__
#define __GOKCONTROL_H__
-#include <gnome.h>
+#include <gtk/gtk.h>
/* types of controls */
/* if you modify this array, update ArrayControlTypeNames in gok-control.c */
diff --git a/gok/gok-editor.c b/gok/gok-editor.c
index 4632607..582b2f4 100644
--- a/gok/gok-editor.c
+++ b/gok/gok-editor.c
@@ -24,7 +24,8 @@
#include <config.h>
#endif
-#include <gnome.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include <glade/glade.h>
#include "gok-log.h"
#include "gok-keyboard.h"
diff --git a/gok/gok-feedback.h b/gok/gok-feedback.h
index 7847ca0..575ce2b 100644
--- a/gok/gok-feedback.h
+++ b/gok/gok-feedback.h
@@ -23,7 +23,6 @@
#define __GOKFEEDBACK_H__
#include "gok-key.h"
-#include <gnome.h>
#ifdef __cplusplus
extern "C" {
diff --git a/gok/gok-glade-helpers.c b/gok/gok-glade-helpers.c
index b518a56..a73ae23 100644
--- a/gok/gok-glade-helpers.c
+++ b/gok/gok-glade-helpers.c
@@ -19,7 +19,6 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
#include <gconf/gconf-client.h>
#include <glade/glade.h>
#include "gok-glade-helpers.h"
diff --git a/gok/gok-input.c b/gok/gok-input.c
index 056390c..d8558f6 100644
--- a/gok/gok-input.c
+++ b/gok/gok-input.c
@@ -23,10 +23,10 @@
# include <config.h>
#endif
-#include <gnome.h>
-
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
#include "gok-gconf-keys.h"
#include "gok-log.h"
diff --git a/gok/gok-key.c b/gok/gok-key.c
index a9e4b5d..32ab9b9 100644
--- a/gok/gok-key.c
+++ b/gok/gok-key.c
@@ -24,7 +24,9 @@
#endif
#include <string.h>
-#include <gnome.h>
+#include <libgnome/gnome-program.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include "gok-key.h"
#include "gok-keyboard.h"
#include "gok-mousecontrol.h"
diff --git a/gok/gok-key.h b/gok/gok-key.h
index bdcbf31..c3ef5c0 100644
--- a/gok/gok-key.h
+++ b/gok/gok-key.h
@@ -30,7 +30,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
#include "gok-spy-priv.h"
#include "gok-output.h"
#include "gok-word-complete.h"
diff --git a/gok/gok-keyboard.c b/gok/gok-keyboard.c
index 094bbc6..7870fdd 100644
--- a/gok/gok-keyboard.c
+++ b/gok/gok-keyboard.c
@@ -29,6 +29,8 @@
#include <X11/keysymdef.h> /* ugh, needed by link following hack */
#include <assert.h>
#include <gdk/gdk.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include <math.h>
#include "gok-keyboard.h"
#include "gok-mousecontrol.h"
diff --git a/gok/gok-keyboard.h b/gok/gok-keyboard.h
index e565fbe..89e95f1 100644
--- a/gok/gok-keyboard.h
+++ b/gok/gok-keyboard.h
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <gnome.h>
#include <libxml/xmlmemory.h>
#include <glib.h>
#include <X11/Xlib.h>
diff --git a/gok/gok-modifier-keymasks.h b/gok/gok-modifier-keymasks.h
index 853337f..e953c6b 100644
--- a/gok/gok-modifier-keymasks.h
+++ b/gok/gok-modifier-keymasks.h
@@ -22,7 +22,7 @@
#ifndef __GOK_MODIFIER_KEYMASKS_H__
#define __GOK_MODIFIER_KEYMASKS_H__
-#include <gnome.h>
+#include <glib.h>
struct gok_modifier_keymask {
gchar *name;
diff --git a/gok/gok-modifier.h b/gok/gok-modifier.h
index 800e59d..edbeaaf 100644
--- a/gok/gok-modifier.h
+++ b/gok/gok-modifier.h
@@ -22,7 +22,6 @@
#ifndef __GOKMODIFIER_H__
#define __GOKMODIFIER_H__
-#include <gnome.h>
#include "gok-output.h"
#include "gok-key.h"
#include "gok-keyboard.h"
diff --git a/gok/gok-output.h b/gok/gok-output.h
index 6182096..a288fe6 100644
--- a/gok/gok-output.h
+++ b/gok/gok-output.h
@@ -24,7 +24,6 @@
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
-#include <gnome.h>
#include <cspi/spi.h>
#ifdef __cplusplus
diff --git a/gok/gok-page-accessmethod.h b/gok/gok-page-accessmethod.h
index 9539909..3b045ed 100644
--- a/gok/gok-page-accessmethod.h
+++ b/gok/gok-page-accessmethod.h
@@ -22,7 +22,6 @@
#ifndef __GOK_PAGE_ACCESSMETHOD_H__
#define __GOK_PAGE_ACCESSMETHOD_H__
-#include <gnome.h>
#include <glade/glade.h>
#include "gok-scanner.h"
diff --git a/gok/gok-page-actions.c b/gok/gok-page-actions.c
index 0d89c6a..c535f73 100644
--- a/gok/gok-page-actions.c
+++ b/gok/gok-page-actions.c
@@ -25,6 +25,8 @@
#include <gtk/gtk.h>
#include <glade/glade.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include "gok-page-actions.h"
#include "gok-action.h"
#include "gok-input.h"
diff --git a/gok/gok-page-actions.h b/gok/gok-page-actions.h
index 7e2f148..185b988 100644
--- a/gok/gok-page-actions.h
+++ b/gok/gok-page-actions.h
@@ -19,7 +19,6 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
#include "gok-action.h"
gboolean gok_page_actions_initialize (GladeXML* xml);
diff --git a/gok/gok-page-feedbacks.c b/gok/gok-page-feedbacks.c
index ec44463..5e526f2 100644
--- a/gok/gok-page-feedbacks.c
+++ b/gok/gok-page-feedbacks.c
@@ -24,6 +24,8 @@
#endif
#include <gtk/gtk.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include "gok-page-feedbacks.h"
#include "gok-feedback.h"
#include "gok-log.h"
diff --git a/gok/gok-page-feedbacks.h b/gok/gok-page-feedbacks.h
index c0b0642..78166e5 100644
--- a/gok/gok-page-feedbacks.h
+++ b/gok/gok-page-feedbacks.h
@@ -19,7 +19,6 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
#include <glade/glade.h>
#include "gok-feedback.h"
diff --git a/gok/gok-page-keyboard.c b/gok/gok-page-keyboard.c
index 0c5b7c4..9c07cab 100644
--- a/gok/gok-page-keyboard.c
+++ b/gok/gok-page-keyboard.c
@@ -22,8 +22,11 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include <libgnomeui/libgnomeui.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include "gok-page-keyboard.h"
#include "gok-data.h"
#include "gok-log.h"
diff --git a/gok/gok-page-keyboard.h b/gok/gok-page-keyboard.h
index 101e623..9d53d81 100644
--- a/gok/gok-page-keyboard.h
+++ b/gok/gok-page-keyboard.h
@@ -19,8 +19,6 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
-
gboolean gok_page_keyboard_initialize (GladeXML* xml);
void gok_page_keyboard_refresh (void);
gboolean gok_page_keyboard_apply (void);
diff --git a/gok/gok-page-keysizespace.c b/gok/gok-page-keysizespace.c
index dd4fdfe..f9bacc8 100644
--- a/gok/gok-page-keysizespace.c
+++ b/gok/gok-page-keysizespace.c
@@ -24,6 +24,8 @@
#endif
#include <glade/glade.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include "gok-page-keysizespace.h"
#include "gok-data.h"
#include "gok-log.h"
diff --git a/gok/gok-page-keysizespace.h b/gok/gok-page-keysizespace.h
index c62c809..60b2596 100644
--- a/gok/gok-page-keysizespace.h
+++ b/gok/gok-page-keysizespace.h
@@ -19,8 +19,6 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
-
gboolean gok_settings_page_keysizespace_initialize (GladeXML* xml);
void gok_settings_page_keysizespace_refresh (void);
gboolean gok_settings_page_keysizespace_ok (void);
diff --git a/gok/gok-page-wordcomplete.h b/gok/gok-page-wordcomplete.h
index 3e56d4c..193f963 100644
--- a/gok/gok-page-wordcomplete.h
+++ b/gok/gok-page-wordcomplete.h
@@ -19,8 +19,6 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
-
gboolean gok_page_wordcomplete_initialize (GladeXML* xml);
void gok_page_wordcomplete_refresh (void);
gboolean gok_page_wordcomplete_apply (void);
diff --git a/gok/gok-repeat.h b/gok/gok-repeat.h
index a2b5e8f..9cf16fa 100644
--- a/gok/gok-repeat.h
+++ b/gok/gok-repeat.h
@@ -22,7 +22,6 @@
#ifndef __GOKREPEAT_H__
#define __GOKREPEAT_H__
-#include <gnome.h>
#include "gok-key.h"
gboolean gok_repeat_getArmed(void);
diff --git a/gok/gok-scanner.c b/gok/gok-scanner.c
index 1e74717..f21b00e 100644
--- a/gok/gok-scanner.c
+++ b/gok/gok-scanner.c
@@ -26,6 +26,8 @@
#include <dirent.h>
#include <locale.h>
#include <gconf/gconf-client.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include "gok-scanner.h"
#include "gok-data.h"
#include "gok-log.h"
diff --git a/gok/gok-settings-dialog.c b/gok/gok-settings-dialog.c
index 26e49a3..f551b92 100644
--- a/gok/gok-settings-dialog.c
+++ b/gok/gok-settings-dialog.c
@@ -27,7 +27,6 @@
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
-#include <gnome.h>
#include <glade/glade.h>
#include "gok-settings-dialog.h"
#include "gok-page-keysizespace.h"
diff --git a/gok/gok-settings-dialog.h b/gok/gok-settings-dialog.h
index 275452b..c927798 100644
--- a/gok/gok-settings-dialog.h
+++ b/gok/gok-settings-dialog.h
@@ -22,7 +22,6 @@
#ifndef __GOKSETTINGSDIALOG_H__
#define __GOKSETTINGSDIALOG_H__
-#include <gnome.h>
#include <glade/glade.h>
#ifdef __cplusplus
diff --git a/gok/gok-sliding-window-word-complete.c b/gok/gok-sliding-window-word-complete.c
index 8550b19..549101f 100644
--- a/gok/gok-sliding-window-word-complete.c
+++ b/gok/gok-sliding-window-word-complete.c
@@ -20,7 +20,7 @@
*/
#include <string.h>
-#include <gnome.h>
+#include <libgnome/gnome-macros.h>
#include "gok-log.h"
#include "gok-sliding-window-word-complete.h"
diff --git a/gok/gok-speech.c b/gok/gok-speech.c
index fbebb34..f954ac7 100644
--- a/gok/gok-speech.c
+++ b/gok/gok-speech.c
@@ -24,7 +24,6 @@
#include <config.h>
#endif
-#include <gnome.h>
#include <libbonobo.h>
#include <locale.h>
#include <gnome-speech/gnome-speech.h>
diff --git a/gok/gok-spy.c b/gok/gok-spy.c
index 3f4af0d..b9befe1 100644
--- a/gok/gok-spy.c
+++ b/gok/gok-spy.c
@@ -39,6 +39,8 @@
#include <string.h>
#include <stdlib.h>
#include <libspi/keymasks.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include "main.h"
#include "gok-spy.h"
#include "gok-log.h"
diff --git a/gok/gok-utf8-word-complete.c b/gok/gok-utf8-word-complete.c
index cbcfda0..46652b4 100644
--- a/gok/gok-utf8-word-complete.c
+++ b/gok/gok-utf8-word-complete.c
@@ -20,7 +20,9 @@
*/
#include <string.h>
-#include <gnome.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <libgnome/gnome-macros.h>
#include "gok-log.h"
#include "gok-utf8-word-complete.h"
diff --git a/gok/gok-windowlister.c b/gok/gok-windowlister.c
index 0d4b3a4..e71439b 100644
--- a/gok/gok-windowlister.c
+++ b/gok/gok-windowlister.c
@@ -33,6 +33,8 @@ use wnck_window_is_active to figure out which window in list is active (since no
#include <libwnck/libwnck.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include "gok-log.h"
#include "main.h"
#include "gok-windowlister.h"
diff --git a/gok/gok-word-complete.c b/gok/gok-word-complete.c
index 0a02bfb..bae3d44 100644
--- a/gok/gok-word-complete.c
+++ b/gok/gok-word-complete.c
@@ -33,6 +33,7 @@
#endif
#include <locale.h>
+#include <libgnome/gnome-macros.h>
#include "gok-word-complete.h"
#include "gok-keyslotter.h"
diff --git a/gok/main.c b/gok/main.c
index 9ea666b..4f31c61 100644
--- a/gok/main.c
+++ b/gok/main.c
@@ -30,7 +30,9 @@
#include <sys/types.h>
#include <dirent.h>
#include <signal.h>
-#include <gnome.h>
+#include <libgnome/gnome-program.h>
+#include <libgnomeui/gnome-client.h>
+#include <libgnomeui/libgnomeui.h>
#include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <cspi/spi.h>
diff --git a/gok/test-gok-action.c b/gok/test-gok-action.c
index 48aa5ee..fb8bf64 100644
--- a/gok/test-gok-action.c
+++ b/gok/test-gok-action.c
@@ -24,7 +24,8 @@
# include <config.h>
#endif
-#include <gnome.h>
+#include <glib.h>
+#include <libgnomeui/libgnomeui.h>
#include "gok-action.h"
#include "gok-log.h"
diff --git a/gok/test-gok-bounds.c b/gok/test-gok-bounds.c
index 5993211..cf4c3bb 100644
--- a/gok/test-gok-bounds.c
+++ b/gok/test-gok-bounds.c
@@ -21,7 +21,7 @@
*/
#include <X11/Xlib.h>
-#include <gnome.h>
+#include <glib.h>
#include "gok-bounds.h"
int main ()
diff --git a/gok/test-gok-feedback.c b/gok/test-gok-feedback.c
index fbcc838..84a01bf 100644
--- a/gok/test-gok-feedback.c
+++ b/gok/test-gok-feedback.c
@@ -24,7 +24,7 @@
# include <config.h>
#endif
-#include <gnome.h>
+#include <libgnomeui/libgnomeui.h>
#include "gok-feedback.h"
#include "gok-log.h"
diff --git a/gok/test-gok-wordcomplete.c b/gok/test-gok-wordcomplete.c
index 0f2bd67..87a3044 100644
--- a/gok/test-gok-wordcomplete.c
+++ b/gok/test-gok-wordcomplete.c
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
+#include <libgnomeui/libgnomeui.h>
#include "gok-word-complete.h"
#define PREDICTIONS_PER_INVOCATION 5
diff --git a/gok/word-complete.c b/gok/word-complete.c
index 1f59c19..e90c740 100644
--- a/gok/word-complete.c
+++ b/gok/word-complete.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
-#include <gnome.h>
+#include <libgnome/gnome-macros.h>
#include "word-complete.h"
#include "gok-log.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]