diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-folder-selection-button.c | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 9d93afd5a7..83058385cb 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,12 @@ 2007-11-23 Milan Crha <mcrha@redhat.com> + ** Fix for bug #494414 + + * em-folder-selection-button.c: (set_contents): If used uri points + to an account, then prepend account's name to folder name. + +2007-11-23 Milan Crha <mcrha@redhat.com> + ** Fix for bug #494425 * em-utils.c: (get_unique_file_names): diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index 1a6406943f..a88095082d 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -34,6 +34,7 @@ #include <glib/gi18n.h> #include "mail-component.h" +#include "mail-config.h" #include "em-folder-tree.h" #include "em-folder-selector.h" #include "em-utils.h" @@ -130,7 +131,16 @@ set_contents (EMFolderSelectionButton *button) char *folder_name = em_utils_folder_name_from_uri (priv->uri); if (folder_name) { - gtk_label_set_text (GTK_LABEL (priv->label), _(folder_name)); + EAccount *account = mail_config_get_account_by_source_url (priv->uri); + + if (account) { + char *tmp = folder_name; + folder_name = g_strdup_printf ("%s/%s", e_account_get_string (account, E_ACCOUNT_NAME), _(folder_name)); + g_free (tmp); + gtk_label_set_text (GTK_LABEL (priv->label), folder_name); + } else + gtk_label_set_text (GTK_LABEL (priv->label), _(folder_name)); + g_free (folder_name); } else { set_contents_unselected (button); |