talons

commit e5ad9bc2942112d5462ca0b1feb11e5bbd4068af
parent 9aa189c7f7224dcf53fecfdee41e4fbf2cbc903d
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 25 Aug 2008 05:50:57 +0000

2008-08-25 [colin]	3.5.0cvs71

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

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

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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)