[Commits] [SCM] claws branch, master, updated. 3.13.2-116-g39a8fb8

[ticho at claws-mail.org]

The branch, master has been updated
       via  39a8fb83ee7abecd487ec28c17d83235968e5f6b (commit)
       via  c093e11acb24a2221a8b907e3b9694ea7301f56b (commit)
      from  605671c5d1f854d8c3fe83e220a3e5651ac9d4e0 (commit)

Summary of changes:
 src/plugins/rssyl/rssyl.c            |    6 +++++-
 src/plugins/rssyl/rssyl_feed_props.c |    3 ++-
 src/plugins/rssyl/rssyl_gtk.h        |    2 --
 3 files changed, 7 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 39a8fb83ee7abecd487ec28c17d83235968e5f6b
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Apr 9 15:43:02 2016 +0200

    Remove password from passwordstore when deleting a RSSyl feed.

diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index 139f5af..806a83b 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -624,6 +624,7 @@ static gint rssyl_rename_folder(Folder *folder, FolderItem *item,
 static gint rssyl_remove_folder(Folder *folder, FolderItem *item)
 {
 	gchar *path = NULL;
+	RFolderItem *ritem = (RFolderItem *)item;
 
 	g_return_val_if_fail(folder != NULL, -1);
 	g_return_val_if_fail(item != NULL, -1);
@@ -638,8 +639,11 @@ static gint rssyl_remove_folder(Folder *folder, FolderItem *item)
 		g_free(path);
 		return -1;
 	}
-
 	g_free(path);
+
+	if (ritem->url != NULL)
+		rssyl_passwd_set(ritem, NULL);
+
 	folder_item_remove(item);
 
 	return 0;
diff --git a/src/plugins/rssyl/rssyl_gtk.h b/src/plugins/rssyl/rssyl_gtk.h
index 6a97fc8..ba8ddb7 100644
--- a/src/plugins/rssyl/rssyl_gtk.h
+++ b/src/plugins/rssyl/rssyl_gtk.h
@@ -10,8 +10,6 @@
 void rssyl_gtk_init(void);
 void rssyl_gtk_done(void);
 
-GtkWidget *rssyl_feed_removal_dialog(gchar *name, GtkWidget **rmcache_widget);
-
 void rssyl_gtk_prop(RFolderItem *ritem);
 
 #endif /* __RSSYL_GTK */

commit c093e11acb24a2221a8b907e3b9694ea7301f56b
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Apr 9 15:28:06 2016 +0200

    Update passwordstore if RSSyl feed's URL gets changed.

diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index 7145e02..ac29f24 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -52,8 +52,9 @@ static void rssyl_gtk_prop_store(RFolderItem *ritem)
 
 	url = (gchar *)gtk_entry_get_text(GTK_ENTRY(ritem->feedprop->url));
 
-	if( strlen(url) ) {
+	if( strlen(url) && strcmp(ritem->url, url)) {
 		if( ritem->url ) {
+			rssyl_passwd_set(ritem, NULL);
 			g_free(ritem->url);
 		}
 		ritem->url = g_strdup(url);

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


hooks/post-receive
-- 
Claws Mail