Fix incorrect labels in folder selection dialog

When custom label for folder selection were introduced (in bd8213fe) a
few ones were wrongly set, specifically ones when copying/moving folders
were talking about copying/moving message(s) instead.

Patch by Olivier Brunel.

diff --git a/AUTHORS b/AUTHORS
index 494802b68fc5e88b8fa09155ec2c7052a2d5424e..f84b2cc32e53c7eeda69398bfd6ce4da27bb514f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -311,3 +311,4 @@ contributors (in addition to the above; based on Changelog)
        Ralf Bormann
        Darac Marjal
        Ashish Gupta
        Ralf Bormann
        Darac Marjal
        Ashish Gupta

+       Olivier Brunel

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index a79fad1e57f7de12fae2237b853a9f10263332a2..f5d958c6962a7275c307d9a4f2195f7e02dbd49f 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -102,6 +102,7 @@ static char *CONTRIBS_LIST[] = {
 "Ralf Bormann",
 "H. Merijn Brand",
 "Eugene Brevdo",
 "Ralf Bormann",
 "H. Merijn Brand",
 "Eugene Brevdo",

+"Olivier Brunel",

 "Sean Buckheister",
 "Anton Butanaev",
 "Henrik Carlqvist",
 "Sean Buckheister",
 "Anton Butanaev",
 "Henrik Carlqvist",

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 26e3663a9da2f30066d2e651bd2d3cb4d2dc9482..6e41b40eb245ed8b427171f605c7ac55372ccfb8 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -308,17 +308,16 @@ static void move_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;

+       gchar *msg;

 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != imap_get_class())
                return;
 
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != imap_get_class())
                return;
 

-       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE,
-                       ngettext(
-                               "Select folder to move selected message to",
-                               "Select folder to move selected messages to",
-                               summary_get_selection_count(folderview->summaryview))
-       );
+       msg = g_strdup_printf(_("Select folder to move folder '%s' to"),
+               from_folder->name);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE, msg);
+       g_free(msg);

        if (!to_folder)
                return;
        
        if (!to_folder)
                return;
        


@@ -329,17 +328,16 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;

+       gchar *msg;

 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != imap_get_class())
                return;
 
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != imap_get_class())
                return;
 

-       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE,
-                       ngettext(
-                               "Select folder to copy selected message to",
-                               "Select folder to copy selected messages to",
-                               summary_get_selection_count(folderview->summaryview))
-       );
+       msg = g_strdup_printf(_("Select folder to copy folder '%s' to"),
+               from_folder->name);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE, msg);
+       g_free(msg);

        if (!to_folder)
                return;
        
        if (!to_folder)
                return;
        

diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index 605ef13fa20810a8bc82681ba590a740b6205ae8..f4525be9690e06d407cd33c74c84e95cf699a815 100644 (file)
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -298,17 +298,16 @@ static void move_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;

+       gchar *msg;

 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != mh_get_class())
                return;
 
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != mh_get_class())
                return;
 

-       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE,
-                       ngettext(
-                               "Select folder to move selected message to",
-                               "Select folder to move selected messages to",
-                               summary_get_selection_count(folderview->summaryview))
-       );
+       msg = g_strdup_printf(_("Select folder to move folder '%s' to"),
+               from_folder->name);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE, msg);
+       g_free(msg);

        if (!to_folder)
                return;
        
        if (!to_folder)
                return;
        


@@ -319,17 +318,16 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;

+       gchar *msg;

 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != mh_get_class())
                return;
 
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != mh_get_class())
                return;
 

-       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE,
-                       ngettext(
-                               "Select folder to copy selected message to",
-                               "Select folder to copy selected messages to",
-                               summary_get_selection_count(folderview->summaryview))
-       );
+       msg = g_strdup_printf(_("Select folder to copy folder '%s' to"),
+               from_folder->name);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE, msg);
+       g_free(msg);

        if (!to_folder)
                return;
        
        if (!to_folder)
                return;
        

diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c
index 47b768411eadf62736235737e2fc577154ccc070..d567ec83b54dc135759558f7d24a58439198f9e5 100644 (file)
--- a/src/plugins/mailmbox/plugin_gtk.c
+++ b/src/plugins/mailmbox/plugin_gtk.c
@@ -363,17 +363,16 @@ static void move_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;

+       gchar *msg;

 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
                return;
 
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
                return;
 

-       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE,
-                       ngettext(
-                               "Select folder to move selected message to",
-                               "Select folder to move selected messages to",
-                               summary_get_selection_count(folderview->summaryview))
-       );
+       msg = g_strdup_printf(_("Select folder to move folder '%s' to"),
+               from_folder->name);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE, msg);
+       g_free(msg);

        if (!to_folder)
                return;
 
        if (!to_folder)
                return;
 


@@ -384,17 +383,16 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;

+       gchar *msg;

 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
                return;
 
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
                return;
 

-       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE,
-                       ngettext(
-                               "Select folder to copy selected message to",
-                               "Select folder to copy selected messages to",
-                               summary_get_selection_count(folderview->summaryview))
-       );
+       msg = g_strdup_printf(_("Select folder to copy folder '%s' to"),
+               from_folder->name);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE, msg);
+       g_free(msg);

        if (!to_folder)
                return;
 
        if (!to_folder)
                return;