[Commits] gtkshruler.c 1.1.4.16 1.1.4.17 gtkshruler.h 1.1.4.9 1.1.4.10

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv31821/src/gtk

Modified Files:
      Tag: gtk2
	gtkshruler.c gtkshruler.h 
Log Message:
2011-10-07 [colin]	3.7.10cvs23

	* src/compose.c
	* src/gtk/gtkshruler.c
	* src/gtk/gtkshruler.h
		Disable ruler starting from 2.24.

Index: gtkshruler.h
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkshruler.h,v
retrieving revision 1.1.4.9
retrieving revision 1.1.4.10
diff -u -d -r1.1.4.9 -r1.1.4.10
--- gtkshruler.h	10 Apr 2011 17:19:05 -0000	1.1.4.9
+++ gtkshruler.h	7 Oct 2011 10:13:42 -0000	1.1.4.10
@@ -22,6 +22,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+#if !GTK_CHECK_VERSION(2,24,0)
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,3 +57,4 @@
 
 
 #endif /* __GTK_SHRULER_H__ */
+#endif

Index: gtkshruler.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkshruler.c,v
retrieving revision 1.1.4.16
retrieving revision 1.1.4.17
diff -u -d -r1.1.4.16 -r1.1.4.17
--- gtkshruler.c	10 Apr 2011 17:19:05 -0000	1.1.4.16
+++ gtkshruler.c	7 Oct 2011 10:13:42 -0000	1.1.4.17
@@ -34,6 +34,8 @@
 #include "utils.h"
 #include "gtkutils.h"
 
+#if !GTK_CHECK_VERSION(2,24,0)
+
 #define RULER_HEIGHT          14
 #define MINIMUM_INCR          5
 #define MAXIMUM_SUBDIVIDE     5
@@ -179,3 +181,4 @@
 
 	cairo_destroy(cr);
 }
+#endif