From 53dd05475bea9a6c0152e1d5a88410721c1bd06f Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@imendio.com>
Date: Fri, 25 Apr 2008 15:18:07 +0000
Subject: 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
---
 gtk/gtkiconfactory.c  | 1 -
 gtk/gtkimmodule.c     | 1 -
 gtk/gtkmain.c         | 2 --
 gtk/gtkmodules.c      | 1 -
 gtk/gtkprintcontext.h | 2 +-
 gtk/queryimmodules.c  | 1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'gtk')

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"
-- 
cgit v1.2.1