Fix misplaced HAVE_XFT.

Tue Nov  6 10:13:16 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT.

diff --git a/ChangeLog b/ChangeLog
index da794962ec75073f149fc13dad4f3e095086e4ed..83721f0ab4f418312951b51e3a5d99b01b2b1389 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov  6 10:13:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT.
+
 2001-11-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_paint): expose the child

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index da794962ec75073f149fc13dad4f3e095086e4ed..83721f0ab4f418312951b51e3a5d99b01b2b1389 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Tue Nov  6 10:13:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT.
+
 2001-11-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_paint): expose the child

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index da794962ec75073f149fc13dad4f3e095086e4ed..83721f0ab4f418312951b51e3a5d99b01b2b1389 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Tue Nov  6 10:13:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT.
+
 2001-11-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_paint): expose the child

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index da794962ec75073f149fc13dad4f3e095086e4ed..83721f0ab4f418312951b51e3a5d99b01b2b1389 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Tue Nov  6 10:13:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT.
+
 2001-11-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_paint): expose the child

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index da794962ec75073f149fc13dad4f3e095086e4ed..83721f0ab4f418312951b51e3a5d99b01b2b1389 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Tue Nov  6 10:13:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT.
+
 2001-11-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_paint): expose the child

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index da794962ec75073f149fc13dad4f3e095086e4ed..83721f0ab4f418312951b51e3a5d99b01b2b1389 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Tue Nov  6 10:13:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT.
+
 2001-11-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_paint): expose the child

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index da794962ec75073f149fc13dad4f3e095086e4ed..83721f0ab4f418312951b51e3a5d99b01b2b1389 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Tue Nov  6 10:13:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT.
+
 2001-11-05  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_paint): expose the child

diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index f6c4da625c3956cc04e4a3ff27eccbd460ff5cb5..7412eb726aa7f8d0cf226a3769f9102191fe51f1 100644 (file)
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -754,6 +754,7 @@ gdk_x11_gc_get_xgc (GdkGC *gc)
   return gc_x11->xgc;
 }
 
+#ifdef HAVE_XFT
 /* Various bits of the below are roughly cribbed from XFree86
  * lib/Xft/xftdraw.c, Copyright 2000, Keith Packard
  */
@@ -781,7 +782,6 @@ foreground_format (GdkGC *gc)
                            0);
 }
 
-#ifdef HAVE_XFT
 /**
  * _gdk_x11_gc_get_fg_picture:
  * @gc: a #GdkGC