gtk+ r20042 - in trunk: . gtk modules/input

[mitch svn gnome org]

Author: mitch
Date: Fri Apr 25 15:18:07 2008
New Revision: 20042
URL: http://svn.gnome.org/viewvc/gtk+?rev=20042&view=rev

Log:
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>.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkiconfactory.c
   trunk/gtk/gtkimmodule.c
   trunk/gtk/gtkmain.c
   trunk/gtk/gtkmodules.c
   trunk/gtk/gtkprintcontext.h
   trunk/gtk/queryimmodules.c
   trunk/modules/input/gtkimcontextime.c

Modified: trunk/gtk/gtkiconfactory.c
==============================================================================
--- trunk/gtk/gtkiconfactory.c	(original)
+++ trunk/gtk/gtkiconfactory.c	Fri Apr 25 15:18:07 2008
@@ -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"

Modified: trunk/gtk/gtkimmodule.c
==============================================================================
--- trunk/gtk/gtkimmodule.c	(original)
+++ trunk/gtk/gtkimmodule.c	Fri Apr 25 15:18:07 2008
@@ -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"

Modified: trunk/gtk/gtkmain.c
==============================================================================
--- trunk/gtk/gtkmain.c	(original)
+++ trunk/gtk/gtkmain.c	Fri Apr 25 15:18:07 2008
@@ -49,8 +49,6 @@
 #undef STRICT
 #endif
 
-#include <pango/pango-types.h>	/* For pango_language_from_string */
-
 #include "gtkintl.h"
 
 #include "gtkaccelmap.h"

Modified: trunk/gtk/gtkmodules.c
==============================================================================
--- trunk/gtk/gtkmodules.c	(original)
+++ trunk/gtk/gtkmodules.c	Fri Apr 25 15:18:07 2008
@@ -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

Modified: trunk/gtk/gtkprintcontext.h
==============================================================================
--- trunk/gtk/gtkprintcontext.h	(original)
+++ trunk/gtk/gtkprintcontext.h	Fri Apr 25 15:18:07 2008
@@ -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"
 

Modified: trunk/gtk/queryimmodules.c
==============================================================================
--- trunk/gtk/queryimmodules.c	(original)
+++ trunk/gtk/queryimmodules.c	Fri Apr 25 15:18:07 2008
@@ -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"

Modified: trunk/modules/input/gtkimcontextime.c
==============================================================================
--- trunk/modules/input/gtkimcontextime.c	(original)
+++ trunk/modules/input/gtkimcontextime.c	Fri Apr 25 15:18:07 2008
@@ -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