callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix folder name encoding in em_folder_utils_create_folder().

Browse Source 
When creating a top-level folder, the folder name was still URI-encoded.
So for example "Top Level Folder" was coming out "Top%20Level%20Folder".

The em_folder_tree_store_root_selected() "if" branch is uncommented and
looks unnecessary to me, so I'm removing it.  Always parse the URI with
e_mail_folder_uri_parse(), which produces a decoded folder name.
This commit is contained in:
Matthew Barnes
2013-09-08 13:17:41 -04:00
parent 5305abd266
commit 5136f4e554
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mail/em-folder-utils.c
View File

@ -582,9 +582,10 @@ em_folder_utils_create_folder (GtkWindow *parent,
EMFolderTreeModel *model;
EMailAccountStore *account_store;
CamelStore *store = NULL;
gchar *folder_name = NULL;
GtkWidget *dialog;
GQueue queue = G_QUEUE_INIT;
const gchar *folder_uri;
gchar *folder_name = NULL;
GError *error = NULL;
g_return_if_fail (GTK_IS_WINDOW (parent));
@ -626,28 +627,12 @@ em_folder_utils_create_folder (GtkWindow *parent,
if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
goto exit;
if (em_folder_tree_store_root_selected (folder_tree, &store)) {
const gchar *folder_uri;
folder_uri = em_folder_selector_get_selected_uri (selector);
g_return_if_fail (folder_uri != NULL);
folder_uri = em_folder_selector_get_selected_uri (selector);
if (!folder_uri || !strrchr (folder_uri, '/'))
g_set_error (
&error, CAMEL_FOLDER_ERROR,
CAMEL_FOLDER_ERROR_INVALID,
_("Invalid folder URI '%s'"),
folder_uri ? folder_uri : "null");
else
folder_name = g_strdup (strrchr (folder_uri, '/'));
} else {
const gchar *folder_uri;
folder_uri = em_folder_selector_get_selected_uri (selector);
e_mail_folder_uri_parse (
CAMEL_SESSION (session), folder_uri,
&store, &folder_name, &error);
}
e_mail_folder_uri_parse (
CAMEL_SESSION (session), folder_uri,
&store, &folder_name, &error);
/* XXX This is unlikely to fail since the URI comes straight from
* EMFolderSelector, but leave a breadcrumb if it does fail. */