[Commits] [SCM] claws branch, master, updated. 3.17.0-80-gc01f3c5

ticho at claws-mail.org ticho at claws-mail.org
Thu Oct 4 20:26:57 CEST 2018


The branch, master has been updated
       via  c01f3c5b9042dd0cdd2abc35b6e6b084fa22c51f (commit)
      from  f7dd46558a296973d765f3ba25dfb46e02b501a1 (commit)

Summary of changes:
 src/plugins/rssyl/rssyl_cb_menu.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)


- Log -----------------------------------------------------------------
commit c01f3c5b9042dd0cdd2abc35b6e6b084fa22c51f
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Oct 4 20:25:53 2018 +0200

    Do not use trim_string() in RSSyl's rename folder dialog.

diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 79e70ea..71bd27b 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -185,7 +185,6 @@ void rssyl_rename_cb(GtkAction *action,
 {
 	FolderItem *item;
 	gchar *new_folder;
-	gchar *name;
 	gchar *message;
 	FolderView *folderview = (FolderView*)data;
 	item = folderview_get_selected_item(folderview);
@@ -193,11 +192,9 @@ void rssyl_rename_cb(GtkAction *action,
 	g_return_if_fail(item->path != NULL);
 	g_return_if_fail(item->folder != NULL);
 
-	name = trim_string(item->name, 32);
-	message = g_strdup_printf(_("Input new name for '%s':"), name);
-	new_folder = input_dialog(_("Rename folder"), message, name);
+	message = g_strdup_printf(_("Input new name for '%s':"), item->name);
+	new_folder = input_dialog(_("Rename folder"), message, item->name);
 	g_free(message);
-	g_free(name);
 	if (!new_folder) return;
 
 	if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
@@ -213,9 +210,7 @@ void rssyl_rename_cb(GtkAction *action,
 	}
 
 	if (folder_find_child_item_by_name(folder_item_parent(item), new_folder)) {
-		name = trim_string(new_folder, 32);
-		alertpanel_error(_("The folder '%s' already exists."), name);
-		g_free(name);
+		alertpanel_error(_("The folder '%s' already exists."), new_folder);
 		g_free(new_folder);
 		return;
 	}

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list