diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-12-22 03:23:47 (GMT) |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-12-22 03:23:47 (GMT) |
| commit | 484bd6fc379965a3ad83e758135691d84d595f87 (patch) | |
| tree | c27471948365ec200a2328cf4566d44cffcefcd2 | |
| parent | 1e247284337090fd8f65e4c191652647d95a36ac (diff) | |
PDFDoc constructor assumes ownership of the string passed in.
Tue Dec 21 22:17:04 2004 Owen Taylor <otaylor@redhat.com>
* pdf/xpdf/pdf-document.cc (pdf_document_load): PDFDoc
constructor assumes ownership of the string passed in.
* shell/ev-window.c (ev_window_open): Destroy the error
dialog once we've displayed it.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | pdf/xpdf/pdf-document.cc | 4 | ||||
| -rw-r--r-- | shell/ev-window.c | 1 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Tue Dec 21 22:17:04 2004 Owen Taylor <otaylor@redhat.com> + + * pdf/xpdf/pdf-document.cc (pdf_document_load): PDFDoc + constructor assumes ownership of the string passed in. + + * shell/ev-window.c (ev_window_open): Destroy the error + dialog once we've displayed it. + Tue Dec 21 21:58:56 2004 Owen Taylor <otaylor@redhat.com> * pdf/xpdf/pdf-document.cc shell/ev-view.c: Hook things up diff --git a/pdf/xpdf/pdf-document.cc b/pdf/xpdf/pdf-document.cc index 6078f96..8558c82 100644 --- a/pdf/xpdf/pdf-document.cc +++ b/pdf/xpdf/pdf-document.cc @@ -78,11 +78,9 @@ pdf_document_load (EvDocument *document, filename_g = new GString (filename); g_free (filename); - // open the PDF file + // open the PDF file, assumes ownership of filename_g newDoc = new PDFDoc(filename_g, 0, 0); - delete filename_g; - if (!newDoc->isOk()) { err = newDoc->getErrorCode(); delete newDoc; diff --git a/shell/ev-window.c b/shell/ev-window.c index d04dd91..72fc627 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -177,6 +177,7 @@ ev_window_open (EvWindow *ev_window, const char *uri) gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); g_error_free (error); } |