Fix for Bug 309080: crash on window close.

	* pdf/ev-poppler.cc:

	Fix for Bug 309080: crash on window close.

	* shell/ev-page-action.c: (page_changed_cb):

	Fix for Bug 309168: Fix build with gcc 2.95. Thanks to
	jensgr@gmx.net (Jens Granseuer).

diff --git a/ChangeLog b/ChangeLog
index 689638b1e230d05e0ee4e0b9a58e29faa5585384..f90335244ae77e7c9f81e7908b4f045fb791117f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-06-28  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * pdf/ev-poppler.cc:
+       
+       Fix for Bug 309080: crash on window close.
+       
+       * shell/ev-page-action.c: (page_changed_cb):
+       
+       Fix for Bug 309168: Fix build with gcc 2.95. Thanks to
+       jensgr@gmx.net (Jens Granseuer).
+
 2005-06-25  Marcel Telka  <marcel@telka.sk>
 
        * configure.in (ALL_LINGUAS): Added sk.

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index e5444f60ce65bea6783059718ed49280e94c7d29..9ebc614f8571c5491a64056b6f3d45067a80796d 100644 (file)
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -104,6 +104,11 @@ pdf_document_dispose (GObject *object)
 {
        PdfDocument *pdf_document = PDF_DOCUMENT(object);
 
+       if (pdf_document->search) {
+               pdf_document_search_free (pdf_document->search);
+               pdf_document->search = NULL;
+       }
+
        if (pdf_document->document) {
                g_object_unref (pdf_document->document);
        }

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 7975c8a41577b1e83e106d4cf350bf9445c37507..99f1d6abe26673ab099ee94e7afa4331aad12e17 100644 (file)
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -181,12 +181,13 @@ page_changed_cb (EvPageCache        *page_cache,
        g_assert (proxy);
        
        if (page_cache != NULL && page >= 0) {
-       
+               gchar *page_label;
+
                gtk_entry_set_width_chars (GTK_ENTRY (proxy->entry), 
                                           CLAMP (ev_page_cache_get_max_label_chars (page_cache), 
                                           4, 12));     
                
-               gchar *page_label = ev_page_cache_get_page_label (page_cache, page);
+               page_label = ev_page_cache_get_page_label (page_cache, page);
                gtk_entry_set_text (GTK_ENTRY (proxy->entry), page_label);
                gtk_editable_set_position (GTK_EDITABLE (proxy->entry), -1);
                g_free (page_label);