Fix crash when finalizing a nautilus view after having used the find

2003-12-14  Christian Persch  <chpe@cvs.gnome.org>

	* src/ephy-nautilus-view.c: (ephy_nautilus_view_finalize),
	(gnv_cmd_file_print), (gnv_cmd_edit_find):

	Fix crash when finalizing a nautilus view after having used the
	find dialogue in it.

3 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 77cbc969c..c70faa994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-12-14  Christian Persch  <chpe@cvs.gnome.org>
 
+	* src/ephy-nautilus-view.c: (ephy_nautilus_view_finalize),
+	(gnv_cmd_file_print), (gnv_cmd_edit_find):
+
+	Fix crash when finalizing a nautilus view after having used the
+	find dialogue in it.
+
+2003-12-14  Christian Persch  <chpe@cvs.gnome.org>
+
 	* embed/ephy-history.c: (update_host_on_child_remove),
 	(update_hosts), (page_removed_from_host_cb), (ephy_history_init),
 	(ephy_history_finalize):
diff --git a/NEWS b/NEWS
index 732810ad1..3da9fd428 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ Bugfixes:
 	* Fix crash when printing from js (Christian)
 	* Delete host entries from history db when there are no more
 	  pages from that host in the history (Marco, Christian)
+	* Fix crash of nautilus view after using the find dialogue (Christian)
 
 Translations:
 
diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c
index b6dfa9d86..b95fb99c4 100644
--- a/src/ephy-nautilus-view.c
+++ b/src/ephy-nautilus-view.c
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 
@@ -264,6 +266,8 @@ ephy_nautilus_view_finalize (GObject *object)
 
 	if (p->find_dialog)
 	{
+		g_object_remove_weak_pointer (G_OBJECT (p->find_dialog),
+					      (gpointer *) &p->find_dialog);
 		g_object_unref (p->find_dialog);
 	}
 
@@ -533,7 +537,6 @@ gnv_cmd_file_print (BonoboUIComponent *uic,
 
 	ephy_dialog_set_modal (dialog, TRUE);
 	ephy_dialog_show (dialog);
-
 }
 
 static void
@@ -543,9 +546,11 @@ gnv_cmd_edit_find (BonoboUIComponent *uic,
 {
 	EphyNautilusViewPrivate *p = view->priv;
 
-	if (!p->find_dialog)
+	if (p->find_dialog == NULL)
 	{
 		p->find_dialog = find_dialog_new (p->embed);
+		g_object_add_weak_pointer (G_OBJECT (p->find_dialog),
+					   (gpointer *) &p->find_dialog);
 	}
 
 	ephy_dialog_show (p->find_dialog);