2008-08-27 [colin] 3.5.0cvs75

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

diff --git a/ChangeLog b/ChangeLog
index cd93c14f72b92567769e9d21b3c4768954f00fcb..26550eafe59410db8ad00424b1d6189d6d38321b 100644 (file)
--- 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
index 6334c21a650c39f8baf0ca4dcb52ed9ef8b059cf..8321f29326e261e3c7ba6462b0a5abc3af831fcd 100644 (file)
--- 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
index 00f88ec9439a069c4875719e8e6a319c5b33dd45..1503eb86af6d6ea63d9f9706c329a952fffa46a0 100644 (file)
--- 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
index af725986e3286e9300da7eff719a3d2f75d74d45..89bcbf807e901dac9253a971f96ab81d51a6c30b 100644 (file)
--- 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);