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 /shell/ev-job-queue.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 'shell/ev-job-queue.c')
| -rw-r--r-- | shell/ev-job-queue.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/shell/ev-job-queue.c b/shell/ev-job-queue.c index a860f37..c8c51d8 100644 --- a/shell/ev-job-queue.c +++ b/shell/ev-job-queue.c @@ -12,7 +12,6 @@ static GQueue *render_queue_high = NULL; static GQueue *render_queue_low = NULL; static GQueue *thumbnail_queue_high = NULL; static GQueue *thumbnail_queue_low = NULL; -static GQueue *load_queue = NULL; static GQueue *xfer_queue = NULL; static GQueue *fonts_queue = NULL; @@ -96,8 +95,6 @@ handle_job (EvJob *job) ev_job_thumbnail_run (EV_JOB_THUMBNAIL (job)); else if (EV_IS_JOB_LINKS (job)) ev_job_links_run (EV_JOB_LINKS (job)); - else if (EV_IS_JOB_LOAD (job)) - ev_job_load_run (EV_JOB_LOAD (job)); else if (EV_IS_JOB_XFER (job)) ev_job_xfer_run (EV_JOB_XFER (job)); else if (EV_IS_JOB_RENDER (job)) @@ -135,10 +132,6 @@ search_for_jobs_unlocked (void) if (job) return job; - job = (EvJob *) g_queue_pop_head (load_queue); - if (job) - return job; - job = (EvJob *) g_queue_pop_head (xfer_queue); if (job) return job; @@ -160,7 +153,6 @@ no_jobs_available_unlocked (void) return g_queue_is_empty (render_queue_high) && g_queue_is_empty (render_queue_low) && g_queue_is_empty (links_queue) - && g_queue_is_empty (load_queue) && g_queue_is_empty (xfer_queue) && g_queue_is_empty (thumbnail_queue_high) && g_queue_is_empty (thumbnail_queue_low) @@ -220,7 +212,6 @@ ev_job_queue_init (void) ev_queue_mutex = g_mutex_new (); links_queue = g_queue_new (); - load_queue = g_queue_new (); xfer_queue = g_queue_new (); render_queue_high = g_queue_new (); render_queue_low = g_queue_new (); @@ -256,9 +247,6 @@ find_queue (EvJob *job, return thumbnail_queue_high; else return thumbnail_queue_low; - } else if (EV_IS_JOB_LOAD (job)) { - /* the priority doesn't effect load */ - return load_queue; } else if (EV_IS_JOB_XFER (job)) { /* the priority doesn't effect xfer */ return xfer_queue; @@ -403,8 +391,6 @@ ev_job_queue_remove_job (EvJob *job) retval = retval || remove_job_from_queue_locked (render_queue_low, job); } else if (EV_IS_JOB_LINKS (job)) { retval = remove_job_from_queue_locked (links_queue, job); - } else if (EV_IS_JOB_LOAD (job)) { - retval = remove_job_from_queue_locked (load_queue, job); } else if (EV_IS_JOB_XFER (job)) { retval = remove_job_from_queue_locked (xfer_queue, job); } else if (EV_IS_JOB_FONTS (job)) { |