2008-08-26 [colin] 3.5.0cvs74

	* src/gtk/gtkcmctree.c
		Fix missing inits on old glib

diff --git a/ChangeLog b/ChangeLog
index 68f6e9ca306b5ebdd1e2a3d33406ab977b697231..cd93c14f72b92567769e9d21b3c4768954f00fcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-26 [colin]     3.5.0cvs74
+
+       * src/gtk/gtkcmctree.c
+               Fix missing inits on old glib
+
 2008-08-26 [wwp]       3.5.0cvs73
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index 4846587cde737f1ed7ae4fec564a9cfc34e73a2e..6334c21a650c39f8baf0ca4dcb52ed9ef8b059cf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3485,3 +3485,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmctree.c;  ) > 3.5.0cvs71.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index a10b11b91df049c458c0a0eae477e9b30ba0a656..00f88ec9439a069c4875719e8e6a319c5b33dd45 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=73
+EXTRA_VERSION=74
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
index 5ba1d07f2c92ea7237ecc72fbca5e00b95b2094d..af725986e3286e9300da7eff719a3d2f75d74d45 100644 (file)
--- a/src/gtk/gtkcmctree.c
+++ b/src/gtk/gtkcmctree.c
@@ -681,12 +681,30 @@ gtk_cmctree_set_arg (GObject *object,
   switch (arg_id)
     {
     case ARG_N_COLUMNS: /* construct-only arg, only set at construction time */
+#if !GLIB_CHECK_VERSION(2,10,0)
+      g_return_if_fail (clist->row_mem_chunk == NULL);
+#endif
       clist->columns = MAX (1, g_value_get_uint (value));
+#if !GLIB_CHECK_VERSION(2,10,0)
+      clist->row_mem_chunk = g_mem_chunk_new ("ctree row mem chunk",
+                                             sizeof (GtkCMCTreeRow),
+                                             sizeof (GtkCMCTreeRow)
+                                             * CLIST_OPTIMUM_SIZE,
+                                             G_ALLOC_AND_FREE);
+      clist->cell_mem_chunk = g_mem_chunk_new ("ctree cell mem chunk",
+                                              sizeof (GtkCMCell) * clist->columns,
+                                              sizeof (GtkCMCell) * clist->columns
+                                              * CLIST_OPTIMUM_SIZE,
+                                              G_ALLOC_AND_FREE);
+#endif
       ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
       break;
     case ARG_TREE_COLUMN: /* construct-only arg, only set at construction time */
       ctree->tree_column = g_value_get_uint (value);
-      ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
+#if !GLIB_CHECK_VERSION(2,10,0)
+      if (clist->row_mem_chunk)
+#endif
+        ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
       break;
     case ARG_INDENT:
       gtk_cmctree_set_indent (ctree, g_value_get_uint (value));