Mercurial > pidgin.yaz
changeset 10062:b6178d85d132
[gaim-migrate @ 11037]
marv has mentioned several times in #gaim that we were never using
GTK_WORD_WRAP_CHAR because we were checking if an enum is #ifdef
This fixes that.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 26 Sep 2004 16:17:09 +0000 |
| parents | 83eb12b1f1a1 |
| children | 4b4975b2b1d5 |
| files | src/gtkgaim.h src/gtkimhtml.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkgaim.h Thu Sep 23 13:45:48 2004 +0000 +++ b/src/gtkgaim.h Sun Sep 26 16:17:09 2004 +0000 @@ -38,11 +38,11 @@ #endif /* - * This is backwards-compatibility code for old versions of GTK+ (2.2.1 and - * earlier). It defines the new wrap behavior (unknown in earlier versions) + * This is backwards-compatibility code for older versions of GTK+ (< 2.4.x) + * It defines the new wrap behavior (unknown in earlier versions) * as the old (slightly buggy) wrap behavior. */ -#ifndef GTK_WRAP_WORD_CHAR +#if (!GTK_CHECK_VERSION(2,4,0)) #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD #endif
--- a/src/gtkimhtml.c Thu Sep 23 13:45:48 2004 +0000 +++ b/src/gtkimhtml.c Sun Sep 26 16:17:09 2004 +0000 @@ -59,8 +59,8 @@ #include <pango/pango-font.h> -/* GTK+ < 2.2.2 hack, see gtkdialogs.h for details. */ -#ifndef GTK_WRAP_WORD_CHAR +/* GTK+ < 2.4.x hack, see gtkgaim.h for details. */ +#if (!GTK_CHECK_VERSION(2,4,0)) #define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD #endif