diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-04-25 15:18:07 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-04-25 15:18:07 +0000 |
| commit | 53dd05475bea9a6c0152e1d5a88410721c1bd06f (patch) | |
| tree | 75b084df84fe420dab4fb8d71c605efbfb0852bd | |
| parent | 079dcccc8d87e4a3ae86ff1e17d4076290f891a7 (diff) | |
| download | gtk+-53dd05475bea9a6c0152e1d5a88410721c1bd06f.tar.gz | |
include <pango/pango.h> instead of <pango/pango-layout.h>.
2008-04-25 Michael Natterer <mitch@imendio.com>
* gtk/gtkprintcontext.h: include <pango/pango.h> instead of
<pango/pango-layout.h>.
* gtk/gtkiconfactory.c
* gtk/gtkimmodule.c
* gtk/gtkmain.c
* gtk/gtkmodules.c
* gtk/queryimmodules.c: remove inclusion of single files from
pango, none of them was actually needed.
* modules/input/gtkimcontextime.c: include <pango/pango.h> instead of
<pango/pango-utils.h>.
svn path=/trunk/; revision=20042
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | gtk/gtkiconfactory.c | 1 | ||||
| -rw-r--r-- | gtk/gtkimmodule.c | 1 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmodules.c | 1 | ||||
| -rw-r--r-- | gtk/gtkprintcontext.h | 2 | ||||
| -rw-r--r-- | gtk/queryimmodules.c | 1 | ||||
| -rw-r--r-- | modules/input/gtkimcontextime.c | 2 |
8 files changed, 17 insertions, 8 deletions
@@ -1,5 +1,20 @@ 2008-04-25 Michael Natterer <mitch@imendio.com> + * gtk/gtkprintcontext.h: include <pango/pango.h> instead of + <pango/pango-layout.h>. + + * gtk/gtkiconfactory.c + * gtk/gtkimmodule.c + * gtk/gtkmain.c + * gtk/gtkmodules.c + * gtk/queryimmodules.c: remove inclusion of single files from + pango, none of them was actually needed. + + * modules/input/gtkimcontextime.c: include <pango/pango.h> instead of + <pango/pango-utils.h>. + +2008-04-25 Michael Natterer <mitch@imendio.com> + * gdk/gdkfont.h: include <pango/pango.h> instead of <pango/pango-font.h>. diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 36fedbcb59..da44564f11 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <pango/pango-utils.h> /* For pango_scan_* */ #include "gtkiconfactory.h" #include "gtkiconcache.h" #include "gtkdebug.h" diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index 9f68f62466..6564832db6 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -32,7 +32,6 @@ #include <glib/gstdio.h> #include <gmodule.h> -#include <pango/pango-utils.h> #include "gtkimmodule.h" #include "gtkimcontextsimple.h" #include "gtksettings.h" diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 6749252c10..e8f386751b 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -49,8 +49,6 @@ #undef STRICT #endif -#include <pango/pango-types.h> /* For pango_language_from_string */ - #include "gtkintl.h" #include "gtkaccelmap.h" diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index 23e6bbbf62..280b7fcd6b 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -30,7 +30,6 @@ #include "gtkalias.h" #include <gmodule.h> -#include <pango/pango-utils.h> /* For pango_split_file_list */ typedef struct _GtkModuleInfo GtkModuleInfo; struct _GtkModuleInfo diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h index 936cae4f40..f754ecdd1d 100644 --- a/gtk/gtkprintcontext.h +++ b/gtk/gtkprintcontext.h @@ -22,7 +22,7 @@ #define __GTK_PRINT_CONTEXT_H__ #include <glib-object.h> -#include <pango/pango-layout.h> +#include <pango/pango.h> #include "gtkenums.h" #include "gtkpagesetup.h" diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c index 90310524c1..4c46a8842d 100644 --- a/gtk/queryimmodules.c +++ b/gtk/queryimmodules.c @@ -37,7 +37,6 @@ #define SOEXT ("." G_MODULE_SUFFIX) #endif -#include <pango/pango-utils.h> #include "gtk/gtkrc.h" #include "gtk/gtkimmodule.h" #include "gtk/gtkversion.h" diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c index 615e6a1f60..4a31063c22 100644 --- a/modules/input/gtkimcontextime.c +++ b/modules/input/gtkimcontextime.c @@ -33,7 +33,7 @@ #include "gdk/gdkkeysyms.h" #include "gtk/gtkwidget.h" -#include <pango/pango-utils.h> +#include <pango/pango.h> /* avoid warning */ #ifdef STRICT |