From: Nickolay V. Shmyrev Date: Tue, 28 Jun 2005 07:36:08 +0000 (+0000) Subject: Fix for Bug 309080: crash on window close. X-Git-Tag: EVINCE_0_3_3~200 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=a50ca0528a09e8e001c4600371048774e4029057;p=evince.git 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 689638b1..f9033524 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-06-28 Nickolay V. Shmyrev + + * 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 * configure.in (ALL_LINGUAS): Added sk. diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc index e5444f60..9ebc614f 100644 --- 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 7975c8a4..99f1d6ab 100644 --- 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);