2008-08-25 [colin] 3.5.0cvs71

	* src/gtk/gtkcmctree.c
		Make sure work isn't null

diff --git a/ChangeLog b/ChangeLog
index 21643d6b10ccc449af7f53e136001e8ff3b71ef9..31e37a049cbde8e98d0c4e5afcd4164190c9b1cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-25 [colin]     3.5.0cvs71
+
+       * src/gtk/gtkcmctree.c
+               Make sure work isn't null
+
 2008-08-24 [colin]     3.5.0cvs70
 
        * src/common/ssl.c

diff --git a/PATCHSETS b/PATCHSETS
index 2f7210452940efe10babd5a39bdbdad687aae239..59277be97ae9816ff1e274e5cffbe74bdd603873 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3482,3 +3482,4 @@
 ( cvs diff -u -r 1.274.2.269 -r 1.274.2.270 src/mainwindow.c;  ) > 3.5.0cvs68.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/printing.c;  ) > 3.5.0cvs69.patchset
 ( cvs diff -u -r 1.9.2.31 -r 1.9.2.32 src/common/ssl.c;  ) > 3.5.0cvs70.patchset
+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmctree.c;  ) > 3.5.0cvs71.patchset

diff --git a/configure.ac b/configure.ac
index 3e22a90c40aee7933a7e498149ec8a948b26f8de..56ce2eeadd28ef8b49f2c7d8d52ac26e2a8137d5 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=70
+EXTRA_VERSION=71
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
index 356d0999029ea9b1700c1c81b9027526aecfbc24..5ba1d07f2c92ea7237ecc72fbca5e00b95b2094d 100644 (file)
--- a/src/gtk/gtkcmctree.c
+++ b/src/gtk/gtkcmctree.c
@@ -4163,7 +4163,7 @@ gtk_cmctree_is_viewable (GtkCMCTree     *ctree,
 
   work = GTK_CMCTREE_ROW (node);
 
-  while (work->parent && GTK_CMCTREE_ROW (work->parent)->expanded)
+  while (work && work->parent && GTK_CMCTREE_ROW (work->parent)->expanded)
     work = GTK_CMCTREE_ROW (work->parent);
 
   if (!work->parent)