[goffice] Fix crash in GogGuru. [#610435]

[Jean Bréfort <jbrefort src gnome org>]

commit 0abeb21bdd80c53b0bac7d202c12b258be6002e0
Author: Jean Brefort <jean brefort normalesup org>
Date:   Fri Feb 19 11:38:31 2010 +0100

    Fix crash in GogGuru. [#610435]

 ChangeLog                  |    5 +++++
 NEWS                       |    3 ++-
 goffice/graph/gog-object.c |    4 +---
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 45f4027..bfc741d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-02-19  Jean Brefort  <jean brefort normalesup org>
 
+	* goffice/graph/gog-object.c (gog_object_get_graph): avoid a crash if a
+	parent has been finalized. [#610435]
+
+2010-02-19  Jean Brefort  <jean brefort normalesup org>
+
 	* goffice/graph/gog-axis-line.c (cb_position_toggled),
 	(cb_tick_toggle_changed): use gtk_buildable_get_name instead of
 	gtk_widget_get_name where appropriate.
diff --git a/NEWS b/NEWS
index 138cfd0..b02de10 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,8 @@ goffice 0.8.1:
 Jean:
 	* Remove libglade dependency from pc file. [#609833]
 	* Use gtk_buildable_get_name instead of gtk_widget_get_name where
-	appropriate. Make things work with gtk+ >= 2.19.2.
+	appropriate. [#610434]
+	* Fix crash in GogGuru. [#610435]
 
 --------------------------------------------------------------------------
 goffice 0.8.0:
diff --git a/goffice/graph/gog-object.c b/goffice/graph/gog-object.c
index 0d0e3d0..eede7a1 100644
--- a/goffice/graph/gog-object.c
+++ b/goffice/graph/gog-object.c
@@ -946,9 +946,7 @@ gog_object_get_parent_typed (GogObject const *obj, GType t)
 GogGraph *
 gog_object_get_graph (GogObject const *obj)
 {
-	g_return_val_if_fail (GOG_IS_OBJECT (obj), NULL);
-
-	for (; obj != NULL ; obj = obj->parent)
+	for (; GOG_IS_OBJECT (obj) ; obj = obj->parent)
 		if (GOG_IS_GRAPH (obj))
 			return GOG_GRAPH (obj);
 	return NULL;