[Commits] [SCM] claws branch, master, updated. 3.16.0-58-g2d87b2b

[ticho at claws-mail.org]

The branch, master has been updated
       via  2d87b2b1e4d7e823f895c13a62d817d12e9a6f12 (commit)
      from  a99a6bc52c2006c6910e2fb472c3cac2e714586b (commit)

Summary of changes:
 src/plugins/fancy/fancy_viewer.c |    4 ++--
 src/plugins/vcalendar/day-view.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 2d87b2b1e4d7e823f895c13a62d817d12e9a6f12
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Feb 9 21:19:31 2018 +0100

    Cast to GSourceFunc instead of deprecated GtkFunction when using g_timeout_add().
    
    Also correct return type of fancy_show_mimepart_prepare()
    callback function.

diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 4ecb918..42fc16c 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -287,7 +287,7 @@ static void fancy_show_notice(FancyViewer *viewer, const gchar *message)
 	gtk_label_set_text(GTK_LABEL(viewer->l_link), message);
 }
 
-static gint fancy_show_mimepart_prepare(MimeViewer *_viewer)
+static gboolean fancy_show_mimepart_prepare(MimeViewer *_viewer)
 {
 	FancyViewer *viewer = (FancyViewer *) _viewer;
 
@@ -301,7 +301,7 @@ static void fancy_show_mimepart(MimeViewer *_viewer, const gchar *infile,
 	FancyViewer *viewer = (FancyViewer *) _viewer;
 	viewer->to_load = partinfo;
 	viewer->loading = TRUE;
-	g_timeout_add(5, (GtkFunction)fancy_show_mimepart_prepare, viewer);
+	g_timeout_add(5, (GSourceFunc)fancy_show_mimepart_prepare, viewer);
 }
 
 static void fancy_print(MimeViewer *_viewer)
diff --git a/src/plugins/vcalendar/day-view.c b/src/plugins/vcalendar/day-view.c
index 826b233..63d3fbc 100644
--- a/src/plugins/vcalendar/day-view.c
+++ b/src/plugins/vcalendar/day-view.c
@@ -913,7 +913,7 @@ day_win *create_day_win(FolderItem *item, struct tm tmdate)
 		    		 &dw->event_menu, &dw->event_group,
 		    		 &dw->ui_manager);
 
-    g_timeout_add(100, (GtkFunction)scroll_position_timer, (gpointer)dw);
+    g_timeout_add(100, (GSourceFunc)scroll_position_timer, (gpointer)dw);
 
     return(dw);
 }

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


hooks/post-receive
-- 
Claws Mail