modules/input/gtkimcontextime.h modules/input/gtkimcontextmultipress.h

2008-05-28  Michael Natterer  <mitch@imendio.com>

	* modules/input/gtkimcontextime.h
	* modules/input/gtkimcontextmultipress.h
	* modules/input/gtkimcontextthai.h
	* modules/input/gtkimcontextxim.h: include <gtk/gtk.h> instead of
	individual files.

	* modules/input/gtkimcontextime.c
	* modules/input/gtkimcontextmultipress.c
	* modules/input/gtkimcontextxim.c
	* modules/input/imam-et.c
	* modules/input/imcedilla.c
	* modules/input/imcyrillic-translit.c
	* modules/input/iminuktitut.c
	* modules/input/imipa.c
	* modules/input/imti-er.c
	* modules/input/imti-et.c
	* modules/input/imviqr.c: ditto. Some minor cleanups like moving
	"gtk/gtkintl.h" to the end of includes.


svn path=/trunk/; revision=20200

15 files changed, 38 insertions, 42 deletions

diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index 4a31063c2..c2a87d9f9 100644
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -31,7 +31,6 @@
 
 #include "gdk/win32/gdkwin32.h"
 #include "gdk/gdkkeysyms.h"
-#include "gtk/gtkwidget.h"
 
 #include <pango/pango.h>
 
diff --git a/modules/input/gtkimcontextime.h b/modules/input/gtkimcontextime.h
index e4d97d926..638c11cfb 100644
--- a/modules/input/gtkimcontextime.h
+++ b/modules/input/gtkimcontextime.h
@@ -21,7 +21,7 @@
  * $Id$
  */
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 
 extern GType gtk_type_im_context_ime;
 
diff --git a/modules/input/gtkimcontextmultipress.c b/modules/input/gtkimcontextmultipress.c
index c09bb0857..427deed72 100644
--- a/modules/input/gtkimcontextmultipress.c
+++ b/modules/input/gtkimcontextmultipress.c
@@ -16,17 +16,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
+#include <string.h>
+
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
+
+#include "gtk/gtkimmodule.h"
 #include "gtkimcontextmultipress.h"
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkimmodule.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gdk/gdkwindow.h>
-#include <gdk/gdkkeysyms.h> /* For GDK_A, etc. */
-#include <glib.h> /* For GKeyFile */
-#include <glib-object.h>
-#include <string.h> /* For memset() */
 
 #define AUTOMATIC_COMPOSE_TIMEOUT 1 /* seconds */
 
diff --git a/modules/input/gtkimcontextmultipress.h b/modules/input/gtkimcontextmultipress.h
index a7d94d9f6..aa564a22e 100644
--- a/modules/input/gtkimcontextmultipress.h
+++ b/modules/input/gtkimcontextmultipress.h
@@ -19,7 +19,7 @@
 #ifndef __GTK_IM_CONTEXT_MULTIPRESS_H
 #define __GTK_IM_CONTEXT_MULTIPRESS_H
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/modules/input/gtkimcontextthai.h b/modules/input/gtkimcontextthai.h
index 06b37f015..bb5faee50 100644
--- a/modules/input/gtkimcontextthai.h
+++ b/modules/input/gtkimcontextthai.h
@@ -22,7 +22,7 @@
 #ifndef __GTK_IM_CONTEXT_THAI_H__
 #define __GTK_IM_CONTEXT_THAI_H__
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 7cd0b2ea7..22db5cfe2 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -22,12 +22,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtklabel.h"
-#include "gtk/gtksignal.h"
-#include "gtk/gtkwindow.h"
 #include "gtkimcontextxim.h"
 
+#include "gtk/gtkintl.h"
+
 typedef struct _StatusWindow StatusWindow;
 typedef struct _GtkXIMInfo GtkXIMInfo;
 
diff --git a/modules/input/gtkimcontextxim.h b/modules/input/gtkimcontextxim.h
index 685b39444..36c77cd2e 100644
--- a/modules/input/gtkimcontextxim.h
+++ b/modules/input/gtkimcontextxim.h
@@ -20,7 +20,7 @@
 #ifndef __GTK_IM_CONTEXT_XIM_H__
 #define __GTK_IM_CONTEXT_XIM_H__
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 #include "x11/gdkx.h"
 
 G_BEGIN_DECLS
diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c
index 5ba271e70..cf5f50dcc 100644
--- a/modules/input/imam-et.c
+++ b/modules/input/imam-et.c
@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_am_et_translit = 0;
 
diff --git a/modules/input/imcedilla.c b/modules/input/imcedilla.c
index c74ba68f6..1a31fe601 100644
--- a/modules/input/imcedilla.c
+++ b/modules/input/imcedilla.c
@@ -23,11 +23,12 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
+
 
 GType type_cedilla = 0;
 
diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index cf7fdb595..c9014c712 100644
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -23,11 +23,11 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_cyrillic_translit = 0;
 
diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c
index 2311936f6..c13eb0643 100644
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -26,11 +26,11 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_inuktitut_translit = 0;
 
diff --git a/modules/input/imipa.c b/modules/input/imipa.c
index 10d944dd5..3f44aeb19 100644
--- a/modules/input/imipa.c
+++ b/modules/input/imipa.c
@@ -23,11 +23,11 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_ipa = 0;
 
diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c
index c00350c7b..42837f253 100644
--- a/modules/input/imti-er.c
+++ b/modules/input/imti-er.c
@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_ti_er_translit = 0;
 
diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c
index b4bd2001c..49bf8759c 100644
--- a/modules/input/imti-et.c
+++ b/modules/input/imti-et.c
@@ -29,11 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_ti_et_translit = 0;
 
diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c
index 20f4d99db..b4f775fe9 100644
--- a/modules/input/imviqr.c
+++ b/modules/input/imviqr.c
@@ -26,11 +26,11 @@
 #include <config.h>
 #include <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
 
-#include "gtk/gtkintl.h"
-#include "gtk/gtkimcontextsimple.h"
 #include "gtk/gtkimmodule.h"
+#include "gtk/gtkintl.h"
 
 GType type_viqr_translit = 0;