diff options
| author | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2006-04-02 23:24:26 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2006-04-02 23:24:26 (GMT) |
| commit | a4a3a2301361cb6a71e1b127e8e43589f2749105 (patch) | |
| tree | f70db318215d8b3517999c0ad58407ff366536ef /properties/ev-properties-main.c | |
| parent | f0d4f37e3b6a3433c15e1e35236c1ccffeca4bee (diff) | |
Cleanup mime type detection on document load. Fix for the bug #336448.
* backend/ev-document-factory.c: (get_document_from_uri),
(ev_document_factory_get_document):
* backend/ev-document-factory.h:
* properties/ev-properties-main.c: (ev_properties_get_pages):
* shell/Makefile.am:
* shell/ev-job-queue.c: (handle_job), (search_for_jobs_unlocked),
(no_jobs_available_unlocked), (ev_job_queue_init), (find_queue),
(ev_job_queue_remove_job):
* shell/ev-job-queue.h:
* shell/ev-job-xfer.c:
* shell/ev-job-xfer.h:
* shell/ev-jobs.c: (ev_job_fonts_init), (ev_job_fonts_class_init),
(ev_job_fonts_new), (ev_job_fonts_run), (ev_job_xfer_init),
(ev_job_xfer_dispose), (ev_job_xfer_class_init), (ev_job_xfer_new),
(ev_job_xfer_run):
* shell/ev-jobs.h:
* shell/ev-window.c: (ev_window_is_empty),
(password_dialog_response), (ev_window_clear_xfer_job),
(ev_window_xfer_job_cb), (ev_window_open_uri),
(ev_window_cmd_focus_page_selector),
(ev_window_cmd_scroll_forward), (ev_window_cmd_scroll_backward),
(ev_window_cmd_continuous), (ev_window_cmd_dual),
(ev_window_cmd_view_best_fit), (ev_window_cmd_view_page_width),
(ev_window_dispose):
* thumbnailer/evince-thumbnailer.c: (evince_thumbnail_pngenc_get):
* Cleanup mime type detection on document load. Fix for the
bug #336448.
Diffstat (limited to 'properties/ev-properties-main.c')
| -rw-r--r-- | properties/ev-properties-main.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/properties/ev-properties-main.c b/properties/ev-properties-main.c index c97f7fc..f726591 100644 --- a/properties/ev-properties-main.c +++ b/properties/ev-properties-main.c @@ -83,7 +83,6 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider, GList *files) { GError *error = NULL; - char *mime; EvDocument *document; GList *pages = NULL; NautilusFileInfo *file; @@ -98,20 +97,18 @@ ev_properties_get_pages (NautilusPropertyPageProvider *provider, file = files->data; /* okay, make the page */ - mime = nautilus_file_info_get_mime_type (file); - document = ev_document_factory_get_from_mime (mime); - g_free (mime); if (document == NULL) goto end; uri = nautilus_file_info_get_uri (file); - if (!ev_document_load (document, uri, &error)) { - if (error) { - g_error_free (error); - } + document = ev_document_factory_get_document (uri, &error); + + if (error) { + g_error_free (error); goto end; } + label = gtk_label_new (_("Document")); page = ev_properties_view_new (); ev_properties_view_set_info (EV_PROPERTIES_VIEW (page), |