From d6ef4416f5d8e315981df89089e8c3d970bb27c6 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 27 May 2008 23:55:28 +0000 Subject: [PATCH] modules/input/gtkimcontextime.h modules/input/gtkimcontextmultipress.h 2008-05-28 Michael Natterer * modules/input/gtkimcontextime.h * modules/input/gtkimcontextmultipress.h * modules/input/gtkimcontextthai.h * modules/input/gtkimcontextxim.h: include 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 --- ChangeLog | 21 +++++++++++++++++++++ modules/input/gtkimcontextime.c | 1 - modules/input/gtkimcontextime.h | 2 +- modules/input/gtkimcontextmultipress.c | 18 ++++++++---------- modules/input/gtkimcontextmultipress.h | 2 +- modules/input/gtkimcontextthai.h | 2 +- modules/input/gtkimcontextxim.c | 6 ++---- modules/input/gtkimcontextxim.h | 2 +- modules/input/imam-et.c | 4 ++-- modules/input/imcedilla.c | 7 ++++--- modules/input/imcyrillic-translit.c | 6 +++--- modules/input/iminuktitut.c | 6 +++--- modules/input/imipa.c | 6 +++--- modules/input/imti-er.c | 6 +++--- modules/input/imti-et.c | 6 +++--- modules/input/imviqr.c | 6 +++--- 16 files changed, 59 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03e42cec6c..8e8f14dc1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2008-05-28 Michael Natterer + + * modules/input/gtkimcontextime.h + * modules/input/gtkimcontextmultipress.h + * modules/input/gtkimcontextthai.h + * modules/input/gtkimcontextxim.h: include 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. + 2008-05-28 Michael Natterer * modules/engines/pixbuf/pixbuf-style.h diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c index 4a31063c22..c2a87d9f9f 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 diff --git a/modules/input/gtkimcontextime.h b/modules/input/gtkimcontextime.h index e4d97d9265..638c11cfb8 100644 --- a/modules/input/gtkimcontextime.h +++ b/modules/input/gtkimcontextime.h @@ -21,7 +21,7 @@ * $Id$ */ -#include +#include extern GType gtk_type_im_context_ime; diff --git a/modules/input/gtkimcontextmultipress.c b/modules/input/gtkimcontextmultipress.c index c09bb0857c..427deed72b 100644 --- a/modules/input/gtkimcontextmultipress.c +++ b/modules/input/gtkimcontextmultipress.c @@ -16,17 +16,15 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + +#include + +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" + +#include "gtk/gtkimmodule.h" #include "gtkimcontextmultipress.h" -#include -#include -#include -#include -#include -#include -#include /* For GDK_A, etc. */ -#include /* For GKeyFile */ -#include -#include /* For memset() */ #define AUTOMATIC_COMPOSE_TIMEOUT 1 /* seconds */ diff --git a/modules/input/gtkimcontextmultipress.h b/modules/input/gtkimcontextmultipress.h index a7d94d9f66..aa564a22e9 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 +#include G_BEGIN_DECLS diff --git a/modules/input/gtkimcontextthai.h b/modules/input/gtkimcontextthai.h index 06b37f015f..bb5faee509 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 +#include G_BEGIN_DECLS diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index 7cd0b2ea7f..22db5cfe2e 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -22,12 +22,10 @@ #include #include -#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 685b394443..36c77cd2ef 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 +#include #include "x11/gdkx.h" G_BEGIN_DECLS diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c index 5ba271e703..cf5f50dcc0 100644 --- a/modules/input/imam-et.c +++ b/modules/input/imam-et.c @@ -29,11 +29,11 @@ #include #include +#include #include -#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 c74ba68f64..1a31fe6018 100644 --- a/modules/input/imcedilla.c +++ b/modules/input/imcedilla.c @@ -23,11 +23,12 @@ #include #include -#include +#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 cf7fdb595e..c9014c712e 100644 --- a/modules/input/imcyrillic-translit.c +++ b/modules/input/imcyrillic-translit.c @@ -23,11 +23,11 @@ #include #include -#include +#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 2311936f63..c13eb06433 100644 --- a/modules/input/iminuktitut.c +++ b/modules/input/iminuktitut.c @@ -26,11 +26,11 @@ #include #include -#include +#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 10d944dd5d..3f44aeb190 100644 --- a/modules/input/imipa.c +++ b/modules/input/imipa.c @@ -23,11 +23,11 @@ #include #include -#include +#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 c00350c7b1..42837f2535 100644 --- a/modules/input/imti-er.c +++ b/modules/input/imti-er.c @@ -29,11 +29,11 @@ #include #include -#include +#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 b4bd2001cb..49bf8759c4 100644 --- a/modules/input/imti-et.c +++ b/modules/input/imti-et.c @@ -29,11 +29,11 @@ #include #include -#include +#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 20f4d99db2..b4f775fe95 100644 --- a/modules/input/imviqr.c +++ b/modules/input/imviqr.c @@ -26,11 +26,11 @@ #include #include -#include +#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;