aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/exchange-operations/exchange-contacts.c
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2006-04-19 18:27:27 +0800
committerSushma Rai <rsushma@src.gnome.org>2006-04-19 18:27:27 +0800
commit9a9d6aacb2d12a719af04c2524ab67157e02b3f7 (patch)
treef71760eb05eb08c8e7244f44022dca5532af8ea6 /plugins/exchange-operations/exchange-contacts.c
parent4b751afce260fce7b55112551681ad6d0e730446 (diff)
downloadgsoc2013-evolution-9a9d6aacb2d12a719af04c2524ab67157e02b3f7.tar.gz
gsoc2013-evolution-9a9d6aacb2d12a719af04c2524ab67157e02b3f7.tar.zst
gsoc2013-evolution-9a9d6aacb2d12a719af04c2524ab67157e02b3f7.zip
Setting the e-source properties after both folder rename and new folder
creation. Fixes #328578 and #338876. svn path=/trunk/; revision=31831
Diffstat (limited to 'plugins/exchange-operations/exchange-contacts.c')
-rw-r--r--plugins/exchange-operations/exchange-contacts.c33
1 files changed, 19 insertions, 14 deletions
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index 7e6df68544..0699a70a78 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -109,6 +109,7 @@ e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source)
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
gtk_tree_selection_get_selected(selection, &model, &iter);
+
gchar *ruri;
gtk_tree_model_get (model, &iter, CONTACTSRURI_COL, &ruri, -1);
@@ -405,6 +406,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
ExchangeAccount *account;
ExchangeAccountFolderResult result;
gint offline_status;
+ gboolean rename = FALSE;
uri_text = e_source_get_uri (source);
if (uri_text && strncmp (uri_text, "exchange", 8)) {
@@ -467,27 +469,30 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
}
else if (gruri && strcmp (path, oldpath )) {
/* Rename the folder */
+ rename = TRUE;
result = exchange_account_xfer_folder (account, oldpath, path, TRUE);
- if (result == EXCHANGE_ACCOUNT_FOLDER_OK) {
- e_source_set_name (source, gname);
- e_source_set_relative_uri (source, ruri);
- e_source_set_property (source, "username", username);
- e_source_set_property (source, "auth-domain", "Exchange");
- if (authtype) {
- e_source_set_property (source, "auth-type", authtype);
- g_free (authtype);
- }
- e_source_set_property (source, "auth", "plain/password");
- exchange_operations_update_child_esources (source,
- contacts_old_src_uri,
- ruri);
- }
}
else {
/* Nothing happened specific to exchange; just return */
goto done;
}
switch (result) {
+ case EXCHANGE_ACCOUNT_FOLDER_OK:
+ e_source_set_name (source, gname);
+ e_source_set_relative_uri (source, ruri);
+ e_source_set_property (source, "username", username);
+ e_source_set_property (source, "auth-domain", "Exchange");
+ if (authtype) {
+ e_source_set_property (source, "auth-type", authtype);
+ g_free (authtype);
+ }
+ e_source_set_property (source, "auth", "plain/password");
+ if (rename) {
+ exchange_operations_update_child_esources (source,
+ contacts_old_src_uri,
+ ruri);
+ }
+ break;
case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS:
e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL);
break;