From b8c35f59c0bbcf084482903994fa9415e7d1f4d1 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Apr 26 2011 11:22:22 +0000
Subject: Remove all widgets from the View when reloading the document

Resolves: #606540

---

diff --git a/evince-remove-widgets.patch b/evince-remove-widgets.patch
new file mode 100644
index 0000000..2c05b28
--- /dev/null
+++ b/evince-remove-widgets.patch
@@ -0,0 +1,10 @@
+--- evince-2.30.3/libview/ev-view.c	2010-06-24 10:19:29.000000000 +0200
++++ evince-2.30.3/libview/ev-view.c	2011-04-26 12:42:33.000000000 +0200
+@@ -4586,6 +4586,7 @@ ev_view_document_changed_cb (EvDocumentM
+ 	if (document != view->document) {
+ 		gint current_page;
+ 
++		ev_view_remove_all (view);
+ 		clear_caches (view);
+ 
+ 		if (view->document) {
diff --git a/evince.spec b/evince.spec
index f714da8..a7b6a43 100644
--- a/evince.spec
+++ b/evince.spec
@@ -6,7 +6,7 @@
 
 Name:           evince
 Version:        2.30.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GFDL
@@ -19,6 +19,8 @@ Patch2:         evince-t1font-mapping.patch
 Patch4:         evince-metadata.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=667573
 Patch5:         evince-CVE-2010-2640_CVE-2010-2641_CVE-2010-2642_CVE-2010-2643.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=606540
+Patch6:         evince-remove-widgets.patch
 
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  glib2-devel >= %{glib2_version}
@@ -118,6 +120,7 @@ It adds an additional tab called "Document" to the file properties dialog.
 %patch2 -p1 -b .t1font-map
 %patch4 -p1 -b .metadata
 %patch5 -p1 -b .CVE-2010-2640_CVE-2010-2641_CVE-2010-2642_CVE-2010-2643
+%patch6 -p1 -b .remove-widgets
 
 %build
 %configure --disable-static --disable-scrollkeeper --disable-schemas-install \
@@ -240,6 +243,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
 
 %changelog
+* Tue Apr 26 2011 Marek Kasik <mkasik@redhat.com> - 2.30.3-3
+- Remove all widgets from the View when reloading the document
+- Resolves: #606540
+
 * Thu Jan  6 2011 Marek Kasik <mkasik@redhat.com> - 2.30.3-2
 - Fixes CVE-2010-2640, CVE-2010-2641, CVE-2010-2642 and CVE-2010-2643
 - Resolves: #667573