[Gaim-commits] CVS: gaim/src gtkgaim.h,1.1,1.1.2.1 gtkimhtml.c,1.364.2.1,1.364.2.2

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21599

Modified Files:
      Tag: oldstatus
	gtkgaim.h gtkimhtml.c 
Log Message:
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.



Index: gtkgaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkgaim.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -p -r1.1 -r1.1.2.1
--- gtkgaim.h	20 Aug 2004 05:11:30 -0000	1.1
+++ gtkgaim.h	26 Sep 2004 16:16:54 -0000	1.1.2.1
@@ -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
 

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.364.2.1
retrieving revision 1.364.2.2
diff -u -d -p -r1.364.2.1 -r1.364.2.2
--- gtkimhtml.c	11 Sep 2004 15:38:32 -0000	1.364.2.1
+++ gtkimhtml.c	26 Sep 2004 16:16:54 -0000	1.364.2.2
@@ -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