[Commits] [SCM] claws branch, master, updated. 3.11.1-109-g87adea6

[ticho at claws-mail.org]

The branch, master has been updated
       via  87adea61fd673b7820a5ee5726403577439b8e0e (commit)
       via  8469cc0131fd4ca5fb28b55c63baa57371c6c0e6 (commit)
       via  4dbb2b5d931e7853bd8e7d69ab8f63106f1ddcb2 (commit)
      from  d67428796190e6f730d2d74b9fd8a02c8d236687 (commit)

Summary of changes:
 src/plugins/rssyl/claws.def               |   25 ++++++++++++++++++++++---
 src/plugins/rssyl/rssyl.c                 |   10 ++++------
 src/plugins/rssyl/rssyl_update_comments.c |    4 ++++
 3 files changed, 30 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 87adea61fd673b7820a5ee5726403577439b8e0e
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat May 30 18:33:19 2015 +0200

    RSSyl: Updated list of symbols needed from claws-mail core.
    
    Needed for building for Windows.

diff --git a/src/plugins/rssyl/claws.def b/src/plugins/rssyl/claws.def
index 0c2a033..da5dcbd 100644
--- a/src/plugins/rssyl/claws.def
+++ b/src/plugins/rssyl/claws.def
@@ -1,10 +1,9 @@
 LIBRARY CLAWS-MAIL.EXE
 EXPORTS
-get_locale_dir
-check_plugin_version
 alertpanel_error
 alertpanel_full
 change_dir
+check_plugin_version
 claws_do_idle
 claws_is_exiting
 claws_is_starting
@@ -32,13 +31,19 @@ folder_item_add_msg
 folder_item_append
 folder_item_get_identifier
 folder_item_get_msginfo
+folder_item_get_name
 folder_item_get_path
+folder_item_get_xml
 folder_item_new
 folder_item_parent
+folder_item_prefs_copy_prefs
+folder_item_prefs_save_config
 folder_item_prefs_save_config_recursive
 folder_item_remove
 folder_item_rename
 folder_item_scan
+folder_item_search_msgs_local
+folder_item_set_xml
 folder_item_update_freeze
 folder_item_update_thaw
 folder_local_folder_destroy
@@ -53,18 +58,23 @@ folderview_set
 folderview_unregister_popup
 folderview_unselect
 folder_write_list
+get_locale_dir
 get_rc_dir
 get_tmp_file
+gtk_cmclist_freeze
+gtk_cmclist_get_type
+gtk_cmclist_thaw
 gtk_cmctree_get_type
 gtk_cmctree_is_ancestor
 gtk_cmctree_node_get_row_data
 gtkut_widget_draw_now
-gtkut_window_new
 gtkut_widget_set_can_default
+gtkut_window_new
 inc_offline_should_override
 input_dialog
 is_dir_exist
 is_file_entry_exist
+itos
 log_error
 log_print
 log_warning
@@ -73,13 +83,18 @@ main_window_cursor_wait
 mainwindow_get_mainwindow
 make_dir
 make_dir_hier
+mh_get_class
 mkstemp
+move_file
+msgcache_destroy
+prefs_common
 prefs_common_get_prefs
 prefs_file_close
 prefs_file_close_revert
 prefs_filtering_delete_path
 prefs_gtk_register_page
 prefs_gtk_unregister_page
+prefs_matcher_write_config
 prefs_read_config
 prefs_set_block_label
 prefs_set_default
@@ -91,9 +106,13 @@ procheader_date_parse
 procheader_parse_file
 procmsg_get_message_file
 procmsg_msginfo_unset_flags
+remove_dir_recursive
+slist_free_strings_full
 strtailchomp
 subst_for_shellsafe_filename
 summary_clear_all
 summary_show
 to_number
 trim_string
+xml_attr_new
+xml_tag_add_attr

commit 8469cc0131fd4ca5fb28b55c63baa57371c6c0e6
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat May 30 18:32:35 2015 +0200

    RSSyl: struct dirent doesn't have d_type member on Windows.

diff --git a/src/plugins/rssyl/rssyl_update_comments.c b/src/plugins/rssyl/rssyl_update_comments.c
index 4b5cb33..8040f30 100644
--- a/src/plugins/rssyl/rssyl_update_comments.c
+++ b/src/plugins/rssyl/rssyl_update_comments.c
@@ -88,7 +88,11 @@ void rssyl_update_comments(RFolderItem *ritem)
 			return;
 		}
 
+#ifdef G_OS_WIN32
+		if( (num = to_number(d->d_name)) > 0) {
+#else
 		if( (num = to_number(d->d_name)) > 0 && d->d_type == DT_REG ) {
+#endif
 			debug_print("RSSyl: starting to parse '%s'\n", d->d_name);
 
 			fname = g_strdup_printf("%s%c%s", path, G_DIR_SEPARATOR, d->d_name);

commit 4dbb2b5d931e7853bd8e7d69ab8f63106f1ddcb2
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat May 30 18:31:26 2015 +0200

    RSSyl: Remove unnecessary use of link() in rssyl_add_msgs().

diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index 3b2675a..6e2590a 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -782,12 +782,10 @@ static gint rssyl_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
 		g_return_val_if_fail(destfile != NULL, -1);
 		debug_print("RSSyl: add_msgs: new filename is '%s'\n", destfile);
 
-		if( link(fileinfo->file, destfile) < 0 ) {
-			if( copy_file(fileinfo->file, destfile, TRUE) < 0 ) {
-				g_warning("can't copy message %s to %s\n", fileinfo->file, destfile);
-				g_free(destfile);
-				return -1;
-			}
+		if( copy_file(fileinfo->file, destfile, TRUE) < 0 ) {
+			g_warning("can't copy message %s to %s\n", fileinfo->file, destfile);
+			g_free(destfile);
+			return -1;
 		}
 
 		if( relation != NULL )

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


hooks/post-receive
-- 
Claws Mail