talons

commit 93aeabcdf37677b65fb471ce5ded1b2e2955bb6b
parent 64102792936026d283525be65ff9335f1e0b03a8
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 27 Aug 2008 10:12:32 +0000

2008-08-27 [colin]	3.5.0cvs75

	* src/gtk/gtkcmctree.c
		Fix a few ifdefs

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/gtkcmctree.c
 | 
8
++++----

4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-27 [colin]	3.5.0cvs75
+
+	* src/gtk/gtkcmctree.c
+		Fix a few ifdefs
+
 2008-08-26 [colin]	3.5.0cvs74
 
 	* src/gtk/gtkcmctree.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3486,3 +3486,4 @@
 ( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/image_viewer.c;  ) > 3.5.0cvs72.patchset
 ( cvs diff -u -r 1.36.2.143 -r 1.36.2.144 src/common/utils.c;  ) > 3.5.0cvs73.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmctree.c;  ) > 3.5.0cvs74.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/gtkcmctree.c;  ) > 3.5.0cvs75.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=75
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
@@ -62,7 +62,7 @@ gtk_cmctree_pos_get_type (void)
       { GTK_CMCTREE_POS_AFTER, "GTK_CMCTREE_POS_AFTER", "after" },
       { 0, NULL, NULL }
     };
-#if GTK_CHECK_VERSION(2,10,0)
+#if GLIB_CHECK_VERSION(2,10,0)
     etype = g_enum_register_static (g_intern_static_string ("GtkCMCTreePos"), values);
 #else
     etype = g_enum_register_static ("GtkCMCTreePos", values);
@@ -82,7 +82,7 @@ gtk_cmctree_line_style_get_type (void)
       { GTK_CMCTREE_LINES_TABBED, "GTK_CMCTREE_LINES_TABBED", "tabbed" },
       { 0, NULL, NULL }
     };
-#if GTK_CHECK_VERSION(2,10,0)
+#if GLIB_CHECK_VERSION(2,10,0)
     etype = g_enum_register_static (g_intern_static_string ("GtkCMCTreeLineStyle"), values);
 #else
     etype = g_enum_register_static ("GtkCMCTreeLineStyle", values);
@@ -102,7 +102,7 @@ gtk_cmctree_expander_style_get_type (void)
       { GTK_CMCTREE_EXPANDER_CIRCULAR, "GTK_CMCTREE_EXPANDER_CIRCULAR", "circular" },
       { 0, NULL, NULL }
     };
-#if GTK_CHECK_VERSION(2,10,0)
+#if GLIB_CHECK_VERSION(2,10,0)
     etype = g_enum_register_static (g_intern_static_string ("GtkCMCTreeExpanderStyle"), values);
 #else
     etype = g_enum_register_static ("GtkCMCTreeExpanderStyle", values);
@@ -124,7 +124,7 @@ gtk_cmctree_expansion_type_get_type (void)
       { GTK_CMCTREE_EXPANSION_TOGGLE_RECURSIVE, "GTK_CMCTREE_EXPANSION_TOGGLE_RECURSIVE", "toggle-recursive" },
       { 0, NULL, NULL }
     };
-#if GTK_CHECK_VERSION(2,10,0)
+#if GLIB_CHECK_VERSION(2,10,0)
     etype = g_enum_register_static (g_intern_static_string ("GtkCMCTreeExpansionType"), values);
 #else
     etype = g_enum_register_static ("GtkCMCTreeExpansionType", values);