aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/em-config.c5
-rw-r--r--mail/em-config.h4
-rw-r--r--mail/em-folder-properties.c5
3 files changed, 3 insertions, 11 deletions
diff --git a/mail/em-config.c b/mail/em-config.c
index a5ddb7a702..bad3d92c47 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -118,7 +118,6 @@ em_config_target_free (EConfig *ep,
case EM_CONFIG_TARGET_FOLDER: {
EMConfigTargetFolder *s = (EMConfigTargetFolder *) t;
- g_free (s->uri);
g_object_unref (s->folder);
break; }
case EM_CONFIG_TARGET_PREFS: {
@@ -175,15 +174,13 @@ em_config_new (gint type,
EMConfigTargetFolder *
em_config_target_new_folder (EMConfig *emp,
- CamelFolder *folder,
- const gchar *uri)
+ CamelFolder *folder)
{
EMConfigTargetFolder *t;
t = e_config_target_new (
&emp->config, EM_CONFIG_TARGET_FOLDER, sizeof (*t));
- t->uri = g_strdup (uri);
t->folder = g_object_ref (folder);
return t;
diff --git a/mail/em-config.h b/mail/em-config.h
index f52dcf8714..24b062c7f5 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -51,7 +51,6 @@ struct _EMConfigTargetFolder {
EConfigTarget target;
CamelFolder *folder;
- gchar *uri;
};
struct _EMConfigTargetPrefs {
@@ -84,8 +83,7 @@ EMConfig * em_config_new (gint type,
const gchar *menuid);
EMConfigTargetFolder *
em_config_target_new_folder (EMConfig *emp,
- CamelFolder *folder,
- const gchar *uri);
+ CamelFolder *folder);
EMConfigTargetPrefs *
em_config_target_new_prefs (EMConfig *emp,
GConfClient *gconf);
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index e8137a535b..abc1e21563 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -249,7 +249,6 @@ emfp_dialog_run (AsyncContext *context)
CamelStore *parent_store;
gboolean hide_deleted;
GConfClient *client;
- gchar *folder_uri;
const gchar *name;
const gchar *key;
@@ -334,9 +333,7 @@ emfp_dialog_run (AsyncContext *context)
l = g_slist_prepend (l, &emfp_items[i]);
e_config_add_items ((EConfig *) ec, l, NULL, NULL, emfp_free, context);
- folder_uri = e_mail_folder_uri_from_folder (context->folder);
- target = em_config_target_new_folder (ec, context->folder, folder_uri);
- g_free (folder_uri);
+ target = em_config_target_new_folder (ec, context->folder);
e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
w = e_config_create_widget ((EConfig *) ec);