summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrootavish <[email protected]>2014-08-21 23:50:29 +0530
committerrootavish <[email protected]>2014-08-21 23:50:29 +0530
commit67bb00b6c5105dc840b968db513a1e26bac7b2e0 (patch)
tree9989800bd8b0496fce4687673f8410b63b02a69f
parent17377df48abdf10b6a064d6afdc1a4c95441ae20 (diff)
downloadatril-67bb00b6c5105dc840b968db513a1e26bac7b2e0.tar.bz2
atril-67bb00b6c5105dc840b968db513a1e26bac7b2e0.tar.xz
Resolved the finalising issue
Resolved the issue with epub document where the documents were not getting finalised. My bad, sorry, I fix that with this commit. Also it seems I had set the wrong permissions on ev-view.[c,h]. Also fixed that.
-rw-r--r--libview/ev-jobs.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
index eb4362a1..3590d822 100644
--- a/libview/ev-jobs.c
+++ b/libview/ev-jobs.c
@@ -67,8 +67,8 @@ static void ev_job_page_data_init (EvJobPageData *job);
static void ev_job_page_data_class_init (EvJobPageDataClass *class);
static void ev_job_thumbnail_init (EvJobThumbnail *job);
static void ev_job_thumbnail_class_init (EvJobThumbnailClass *class);
-static void ev_job_load_init (EvJobLoad *job);
-static void ev_job_load_class_init (EvJobLoadClass *class);
+static void ev_job_load_init (EvJobLoad *job);
+static void ev_job_load_class_init (EvJobLoadClass *class);
static void ev_job_save_init (EvJobSave *job);
static void ev_job_save_class_init (EvJobSaveClass *class);
static void ev_job_find_init (EvJobFind *job);
@@ -791,14 +791,13 @@ ev_job_thumbnail_dispose (GObject *object)
}
#if !GTK_CHECK_VERSION(3, 0, 0)
-static void
-web_thumbnail_get_screenshot_cb(WebKitWebView *webview,
- GParamSpec *pspec,
- EvJobThumbnail *job_thumb)
+static gboolean
+web_thumbnail_get_screenshot_cb(EvJobThumbnail *job_thumb)
{
- if (webkit_web_view_get_load_status(webview) != WEBKIT_LOAD_FINISHED) {
- return;
+ if (webkit_web_view_get_load_status (WEBKIT_WEB_VIEW(webview)) != WEBKIT_LOAD_FINISHED) {
+ return TRUE;
}
+
EvPage *page = ev_document_get_page (EV_JOB(job_thumb)->document, job_thumb->page);
job_thumb->surface = webkit_web_view_get_snapshot (WEBKIT_WEB_VIEW(webview));
EvRenderContext *rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale);
@@ -815,6 +814,7 @@ web_thumbnail_get_screenshot_cb(WebKitWebView *webview,
ev_document_doc_mutex_unlock();
ev_job_succeeded(EV_JOB(job_thumb));
+ return FALSE;
}
#else
@@ -904,10 +904,11 @@ ev_job_thumbnail_run (EvJob *job)
}
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(webview),(gchar*)rc->page->backend_page);
-#if !GTK_CHECK_VERSION (3, 0, 0)
- g_signal_connect(WEBKIT_WEB_VIEW(webview),"notify::load-status",
- G_CALLBACK(web_thumbnail_get_screenshot_cb),
- g_object_ref(job_thumb));
+#if !GTK_CHECK_VERSION (3, 0, 0)
+ g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+ (GSourceFunc)web_thumbnail_get_screenshot_cb,
+ g_object_ref (job_thumb),
+ (GDestroyNotify)g_object_unref);
#else
g_signal_connect(WEBKIT_WEB_VIEW(webview),"load-changed",
G_CALLBACK(web_thumbnail_get_screenshot_cb),