aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/subscribe-dialog.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6e5327b817..1a190ceaf9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -2,6 +2,10 @@
* subscribe-dialog.c (setup_subscribe_folder): Use info->name, not
input->full_name. Fixes #1029 in bugzilla.helixcode.com.
+ ({setup,do,cleanup}_subscribe_folder): Update previous fix: Jeff
+ had changed it to use ->full_name instead of ->name because that's
+ what camel_store_subscribe_folder needed. So we need to have
+ *both* names available, one for Camel, one for the shell.
2000-12-24 Christopher James Lahey <clahey@helixcode.com>
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index becb6f5bc6..1c2573cf09 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -268,6 +268,7 @@ typedef struct subscribe_folder_input_s {
typedef struct subscribe_folder_data_s {
char *path;
char *name;
+ char *full_name;
char *url;
} subscribe_folder_data_t;
@@ -303,6 +304,7 @@ setup_subscribe_folder (gpointer in_data, gpointer op_data, CamelException *ex)
data->path = storage_tree_path (input->info);
data->name = g_strdup (input->info->name);
+ data->full_name = g_strdup (input->info->full_name);
data->url = g_strdup (input->info->url);
camel_object_ref (CAMEL_OBJECT (input->store));
@@ -317,9 +319,9 @@ do_subscribe_folder (gpointer in_data, gpointer op_data, CamelException *ex)
mail_tool_camel_lock_up ();
if (input->subscribe)
- camel_store_subscribe_folder (input->store, data->name, ex);
+ camel_store_subscribe_folder (input->store, data->full_name, ex);
else
- camel_store_unsubscribe_folder (input->store, data->name, ex);
+ camel_store_unsubscribe_folder (input->store, data->full_name, ex);
mail_tool_camel_lock_down ();
}
@@ -347,6 +349,7 @@ cleanup_subscribe_folder (gpointer in_data, gpointer op_data,
g_free (data->path);
g_free (data->name);
+ g_free (data->full_name);
g_free (data->url);
camel_object_unref (CAMEL_OBJECT (input->store));