[Commits] [SCM] claws branch, master, updated. 3.13.2-46-g2469a55

[mones at claws-mail.org]

The branch, master has been updated
       via  2469a552be34456072a552f0ea3b1a79f6eeeb37 (commit)
      from  4745b80528426498b9e4f61d0f1a812e94ce1a6e (commit)

Summary of changes:
 src/plugins/fancy/fancy_viewer.c |   11 +----------
 src/plugins/fancy/fancy_viewer.h |    2 --
 2 files changed, 1 insertion(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit 2469a552be34456072a552f0ea3b1a79f6eeeb37
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Feb 19 18:58:34 2016 +0100

    Fix bug #3581: sys:1: Warning: Source ID # was…
    
    …not found when attempting to remove it, and remove unused logic.

diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 80ab139..bafeb0b 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -268,15 +268,7 @@ static gint fancy_show_mimepart_prepare(MimeViewer *_viewer)
 {
 	FancyViewer *viewer = (FancyViewer *) _viewer;
 
-	if (viewer->tag > 0) {
-		gtk_timeout_remove(viewer->tag);
-		viewer->tag = -1;
-		if (viewer->loading) {
-			viewer->stop_previous = TRUE;
-		}
-	}
-
-	viewer->tag = g_timeout_add(5, (GSourceFunc)fancy_show_mimepart_real, viewer);
+	g_timeout_add(5, (GSourceFunc)fancy_show_mimepart_real, viewer);
 	return FALSE;
 }
 
@@ -894,7 +886,6 @@ static MimeViewer *fancy_viewer_create(void)
 	viewer->settings = webkit_web_settings_new();
 	g_object_set(viewer->settings, "user-agent", "Fancy Viewer", NULL);
 	viewer->scrollwin = gtk_scrolled_window_new(NULL, NULL);
-	viewer->tag = -1;
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(viewer->scrollwin),
 				       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(viewer->scrollwin),
diff --git a/src/plugins/fancy/fancy_viewer.h b/src/plugins/fancy/fancy_viewer.h
index 093d971..bc497a5 100644
--- a/src/plugins/fancy/fancy_viewer.h
+++ b/src/plugins/fancy/fancy_viewer.h
@@ -114,9 +114,7 @@ struct _FancyViewer
 	gchar             *filename;
 	MimeInfo          *to_load;
 	gulong            doc_handle;
-	gint              tag;
 	gint              loading;
-	gint              stop_previous;
 
 	/* DOM Objects */
 #if WEBKIT_CHECK_VERSION(1,5,1)

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail