Remove the include of Xft.h, which is already dragged in via pangoxft.h.

Tue Mar  2 01:34:40 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtksettings.c: Remove the include of Xft.h, which is already
	dragged in via pangoxft.h.  (#135496, David Hawthorne)

diff --git a/ChangeLog b/ChangeLog
index 20c3324310accbc420e1fdaccd8f5b94f8000d92..cd290511f1b39b2e9a1f7f1b47ce04d47f027161 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar  2 01:34:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksettings.c: Remove the include of Xft.h, which is already
+       dragged in via pangoxft.h.  (#135496, David Hawthorne)
+
 Mon Mar  1 23:52:15 2004  Tim Janik  <timj@gtk.org>
 
         * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 20c3324310accbc420e1fdaccd8f5b94f8000d92..cd290511f1b39b2e9a1f7f1b47ce04d47f027161 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Mar  2 01:34:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksettings.c: Remove the include of Xft.h, which is already
+       dragged in via pangoxft.h.  (#135496, David Hawthorne)
+
 Mon Mar  1 23:52:15 2004  Tim Janik  <timj@gtk.org>
 
         * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 20c3324310accbc420e1fdaccd8f5b94f8000d92..cd290511f1b39b2e9a1f7f1b47ce04d47f027161 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Mar  2 01:34:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksettings.c: Remove the include of Xft.h, which is already
+       dragged in via pangoxft.h.  (#135496, David Hawthorne)
+
 Mon Mar  1 23:52:15 2004  Tim Janik  <timj@gtk.org>
 
         * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 20c3324310accbc420e1fdaccd8f5b94f8000d92..cd290511f1b39b2e9a1f7f1b47ce04d47f027161 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Mar  2 01:34:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksettings.c: Remove the include of Xft.h, which is already
+       dragged in via pangoxft.h.  (#135496, David Hawthorne)
+
 Mon Mar  1 23:52:15 2004  Tim Janik  <timj@gtk.org>
 
         * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 20c3324310accbc420e1fdaccd8f5b94f8000d92..cd290511f1b39b2e9a1f7f1b47ce04d47f027161 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Mar  2 01:34:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtksettings.c: Remove the include of Xft.h, which is already
+       dragged in via pangoxft.h.  (#135496, David Hawthorne)
+
 Mon Mar  1 23:52:15 2004  Tim Janik  <timj@gtk.org>
 
         * gtk/gtkbindings.[hc]: expose gtk_bindings_activate_event(), changed

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 901197da3e15ba79008d8e3fad169963451a977a..2cfbc1cc340bd941addcc385216d35310387762c 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -43,7 +43,6 @@ struct _GtkSettingsPropertyValue
 };
 
 #ifdef GDK_WINDOWING_X11
-#include <X11/Xft/Xft.h>
 #include <pango/pangoxft.h>
 #include <gdk/x11/gdkx.h>
 #endif