summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--docs/tmpl/utils.sgml92
-rw-r--r--pango/pangoxft-render.h3
3 files changed, 53 insertions, 48 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c65e946..1eeed888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-03-30 Behdad Esfahbod <behdad@gnome.org>
+ Bug 335840 – Typo in including Xft.
+
+ * pangoxft-render.h: Define _XFT_NO_COMPAT_ instead of _XFT_NO_COMPAT.
+
+2006-03-30 Behdad Esfahbod <behdad@gnome.org>
+
* pango/*.[ch]: Make #include syntax in sources and headers more
consistent. We are using the "..." syntax for all Pango headers
in source files, and <...> syntax in all header files, except for
diff --git a/docs/tmpl/utils.sgml b/docs/tmpl/utils.sgml
index 48a03c3f..740c16ae 100644
--- a/docs/tmpl/utils.sgml
+++ b/docs/tmpl/utils.sgml
@@ -15,129 +15,133 @@ backends and modules, but may be useful for other purposes too.
</para>
-<!-- ##### FUNCTION pango_parse_style ##### -->
+<!-- ##### FUNCTION pango_split_file_list ##### -->
<para>
</para>
@str:
-@style:
-@warn:
@Returns:
-<!-- ##### FUNCTION pango_parse_weight ##### -->
+<!-- ##### FUNCTION pango_trim_string ##### -->
<para>
</para>
@str:
-@weight:
-@warn:
@Returns:
-<!-- ##### FUNCTION pango_is_zero_width ##### -->
+<!-- ##### FUNCTION pango_read_line ##### -->
<para>
</para>
-@ch:
+@stream:
+@str:
@Returns:
-<!-- ##### FUNCTION pango_scan_int ##### -->
+<!-- ##### FUNCTION pango_skip_space ##### -->
<para>
</para>
@pos:
-@out:
@Returns:
-<!-- ##### FUNCTION pango_get_lib_subdirectory ##### -->
+<!-- ##### FUNCTION pango_scan_word ##### -->
<para>
</para>
+@pos:
+@out:
@Returns:
-<!-- ##### FUNCTION pango_quantize_line_geometry ##### -->
+<!-- ##### FUNCTION pango_scan_string ##### -->
<para>
</para>
-@thickness:
-@position:
+@pos:
+@out:
+@Returns:
-<!-- ##### FUNCTION pango_language_get_sample_string ##### -->
+<!-- ##### FUNCTION pango_scan_int ##### -->
<para>
</para>
-@language:
+@pos:
+@out:
@Returns:
-<!-- ##### FUNCTION pango_skip_space ##### -->
+<!-- ##### FUNCTION pango_config_key_get ##### -->
<para>
</para>
-@pos:
+@key:
@Returns:
-<!-- ##### FUNCTION pango_parse_variant ##### -->
+<!-- ##### FUNCTION pango_lookup_aliases ##### -->
<para>
</para>
-@str:
-@variant:
-@warn:
-@Returns:
+@fontname:
+@families:
+@n_families:
-<!-- ##### FUNCTION pango_scan_string ##### -->
+<!-- ##### FUNCTION pango_parse_style ##### -->
<para>
</para>
-@pos:
-@out:
+@str:
+@style:
+@warn:
@Returns:
-<!-- ##### FUNCTION pango_read_line ##### -->
+<!-- ##### FUNCTION pango_parse_variant ##### -->
<para>
</para>
-@stream:
@str:
+@variant:
+@warn:
@Returns:
-<!-- ##### FUNCTION pango_config_key_get ##### -->
+<!-- ##### FUNCTION pango_parse_weight ##### -->
<para>
</para>
-@key:
+@str:
+@weight:
+@warn:
@Returns:
-<!-- ##### FUNCTION pango_scan_word ##### -->
+<!-- ##### FUNCTION pango_parse_stretch ##### -->
<para>
</para>
-@pos:
-@out:
+@str:
+@stretch:
+@warn:
@Returns:
@@ -149,12 +153,11 @@ backends and modules, but may be useful for other purposes too.
@Returns:
-<!-- ##### FUNCTION pango_trim_string ##### -->
+<!-- ##### FUNCTION pango_get_lib_subdirectory ##### -->
<para>
</para>
-@str:
@Returns:
@@ -172,33 +175,30 @@ backends and modules, but may be useful for other purposes too.
@bytelen:
-<!-- ##### FUNCTION pango_parse_stretch ##### -->
+<!-- ##### FUNCTION pango_language_get_sample_string ##### -->
<para>
</para>
-@str:
-@stretch:
-@warn:
+@language:
@Returns:
-<!-- ##### FUNCTION pango_lookup_aliases ##### -->
+<!-- ##### FUNCTION pango_is_zero_width ##### -->
<para>
</para>
-@fontname:
-@families:
-@n_families:
+@ch:
+@Returns:
-<!-- ##### FUNCTION pango_split_file_list ##### -->
+<!-- ##### FUNCTION pango_quantize_line_geometry ##### -->
<para>
</para>
-@str:
-@Returns:
+@thickness:
+@position:
diff --git a/pango/pangoxft-render.h b/pango/pangoxft-render.h
index 2d12df05..5313d802 100644
--- a/pango/pangoxft-render.h
+++ b/pango/pangoxft-render.h
@@ -26,8 +26,7 @@
G_BEGIN_DECLS
-#define _XFT_NO_COMPAT
-#define _XFTCOMPAT_H_
+#define _XFT_NO_COMPAT_
#include <X11/Xlib.h>
#include <X11/Xft/Xft.h>
#if defined(XftVersion) && XftVersion >= 20000