From 6f41c201422edd6b4dbf9f9f41b5dc29530d21c6 Mon Sep 17 00:00:00 2001 From: rootavish Date: Thu, 3 Jul 2014 20:36:55 +0530 Subject: Thumbnails for Epub Documents This commit is mainly so that any further changes can be reverted to this state. The thumbnails are of very large sizes so I need to fix that, and in general implement thumbnails. Also I am facing an X-windows error, which I can't seem to fix. I feel it may be a problem with webkit-1.0, so will try the build with gtk3 and webkit2. If so is the case, I'll have to work something out for that. Should be able to push a commit soon where the document can actually be read, soon as I figure out the perfect place for the call to load uri. Other than that more function were modified in accordance with webkit. The error I get when opening the file from the filechooser still persists, I need to fix that too. --- shell/ev-window.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'shell') diff --git a/shell/ev-window.c b/shell/ev-window.c index 8b32ce97..1c80bd52 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -150,7 +150,7 @@ struct _EvWindowPrivate { GtkWidget *sidebar_annots; #ifdef ENABLE_EPUB - /*For web documents.(epub)*/ + /* For web documents.(epub) */ GtkWidget *web_view ; #endif /* Settings */ @@ -1312,6 +1312,9 @@ static void ev_window_set_icon_from_thumbnail (EvJobThumbnail *job, EvWindow *ev_window) { + if (ev_window->priv->document->iswebdocument == TRUE) { + return; + } if (job->thumbnail) { if (ev_document_model_get_inverted_colors (ev_window->priv->model)) ev_document_misc_invert_pixbuf (job->thumbnail); @@ -1563,9 +1566,7 @@ ev_window_load_job_cb (EvJob *job, g_assert (job_load->uri); - if (document->iswebdocument == FALSE) { - ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE); - } + ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE); /* Success! */ if (!ev_job_is_failed (job)) { ev_document_model_set_document (ev_window->priv->model, document); @@ -4289,7 +4290,7 @@ static void ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); - +/* webkit_web_view_load_uri(WEBKIT_WEB_VIEW(ev_window->web_view),"");*/ ev_view_previous_page (EV_VIEW (ev_window->priv->view)); } -- cgit v1.2.1