aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2006-04-17 17:36:16 +0800
committerSushma Rai <rsushma@src.gnome.org>2006-04-17 17:36:16 +0800
commite027656d8d171aa652858db22b81719f19d6b67c (patch)
treec16f26aabbf4d99e84b71ac0954b2a9904ada907
parenteed605e78f123753a61a930132b8e047681fcd29 (diff)
downloadgsoc2013-evolution-e027656d8d171aa652858db22b81719f19d6b67c.tar.gz
gsoc2013-evolution-e027656d8d171aa652858db22b81719f19d6b67c.tar.zst
gsoc2013-evolution-e027656d8d171aa652858db22b81719f19d6b67c.zip
Return TRUE in case of non-exchange accounts. Fixes #338198.
svn path=/trunk/; revision=31819
-rw-r--r--plugins/exchange-operations/ChangeLog8
-rw-r--r--plugins/exchange-operations/exchange-calendar.c3
-rw-r--r--plugins/exchange-operations/exchange-contacts.c17
3 files changed, 17 insertions, 11 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index d47f0ab09a..def311e2b8 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-17 Sushma Rai <rsushma@novell.com>
+
+ * exchange-contacts.c (e_exchange_contacts_check): Return TRUE in case
+ of non-exchange accounts.
+
+ * exchange-calendar.c (e_exchange_calendar_check): Similar.
+ Fixes #338198.
+
2006-04-10 Sushma Rai <rsushma@novell.com>
* exchange-operations.[ch] (is_exchange_personal_folder): Added new to
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index 15d4b1de28..c7ce41b670 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -320,6 +320,9 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
if (rel_uri && !strlen (rel_uri))
return FALSE;
}
+ else {
+ return TRUE;
+ }
if (!calendar_src_exists) {
/* new folder */
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index 936b64deaf..7e6df68544 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -311,19 +311,14 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
base_uri = e_source_group_peek_base_uri (group);
exchange_config_listener_get_offline_status (exchange_global_config_listener,
&offline_status);
- if (base_uri) {
- if (!g_ascii_strncasecmp (base_uri, "exchange", 8)) {
- if (offline_status == OFFLINE_MODE)
- return FALSE;
- if (rel_uri && !strlen (rel_uri)) {
- return FALSE;
- }
- }
- else
- return FALSE;
+ if (base_uri && !g_ascii_strncasecmp (base_uri, "exchange", 8)) {
+ if (offline_status == OFFLINE_MODE)
+ return FALSE;
+ if (rel_uri && !strlen (rel_uri))
+ return FALSE;
}
else {
- return FALSE;
+ return TRUE;
}
if (!contacts_src_exists) {