aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2014-05-13 01:47:16 +0800
committerMilan Crha <mcrha@redhat.com>2014-05-13 01:47:16 +0800
commitd46ad6d3cd44c3c9b730566cbd7719c2961a9bc9 (patch)
treebdc2d2362021b2da8b8b0eaab55ca28af61122ca /calendar
parent4508696844c20530bdf7fe6150c432eb16a9c77b (diff)
downloadgsoc2013-evolution-d46ad6d3cd44c3c9b730566cbd7719c2961a9bc9.tar
gsoc2013-evolution-d46ad6d3cd44c3c9b730566cbd7719c2961a9bc9.tar.gz
gsoc2013-evolution-d46ad6d3cd44c3c9b730566cbd7719c2961a9bc9.tar.bz2
gsoc2013-evolution-d46ad6d3cd44c3c9b730566cbd7719c2961a9bc9.tar.lz
gsoc2013-evolution-d46ad6d3cd44c3c9b730566cbd7719c2961a9bc9.tar.xz
gsoc2013-evolution-d46ad6d3cd44c3c9b730566cbd7719c2961a9bc9.tar.zst
gsoc2013-evolution-d46ad6d3cd44c3c9b730566cbd7719c2961a9bc9.zip
Bug #678843 - May re-prompt password on account re-enable
Diffstat (limited to 'calendar')
-rw-r--r--calendar/calendar.error.xml18
-rw-r--r--calendar/gui/e-calendar-selector.c4
-rw-r--r--calendar/gui/e-memo-list-selector.c4
-rw-r--r--calendar/gui/e-task-list-selector.c4
4 files changed, 24 insertions, 6 deletions
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 9affa1c4d3..0fecc1c7b1 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -373,4 +373,22 @@
<_primary>Moving a memo into the memo list '{0}'</_primary>
</error>
+ <error id="refresh-error-events" type="error">
+ <!-- Translators: {0} is the name of the calendar. -->
+ <_primary>Failed to refresh calendar '{0}'</_primary>
+ <secondary>{1}</secondary>
+ </error>
+
+ <error id="refresh-error-tasks" type="error">
+ <!-- Translators: {0} is the name of the task list. -->
+ <_primary>Failed to refresh task list '{0}'</_primary>
+ <secondary>{1}</secondary>
+ </error>
+
+ <error id="refresh-error-memos" type="error">
+ <!-- Translators: {0} is the name of the memo list. -->
+ <_primary>Failed to refresh memo list '{0}'</_primary>
+ <secondary>{1}</secondary>
+ </error>
+
</error-list>
diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c
index cb3bac9e39..87d4a5d40c 100644
--- a/calendar/gui/e-calendar-selector.c
+++ b/calendar/gui/e-calendar-selector.c
@@ -214,7 +214,7 @@ source_client_connect_cb (GObject *source_object,
titd->src_client = client;
e_client_selector_get_client (
- E_CLIENT_SELECTOR (titd->selector), titd->destination, cancellable,
+ E_CLIENT_SELECTOR (titd->selector), titd->destination, FALSE, cancellable,
destination_client_connect_cb, titd);
return;
@@ -376,7 +376,7 @@ calendar_selector_data_dropped (ESourceSelector *selector,
titd->do_copy = do_copy;
e_client_selector_get_client (
- E_CLIENT_SELECTOR (selector), source, cancellable,
+ E_CLIENT_SELECTOR (selector), source, FALSE, cancellable,
source_client_connect_cb, titd);
exit:
diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c
index b83d383ec1..4246c6b7ab 100644
--- a/calendar/gui/e-memo-list-selector.c
+++ b/calendar/gui/e-memo-list-selector.c
@@ -220,7 +220,7 @@ memo_list_selector_process_data (ESourceSelector *selector,
if (source != NULL) {
e_client_selector_get_client (
- E_CLIENT_SELECTOR (selector), source, NULL,
+ E_CLIENT_SELECTOR (selector), source, FALSE, NULL,
client_connect_cb, g_strdup (old_uid));
g_object_unref (source);
}
@@ -388,7 +388,7 @@ memo_list_selector_data_dropped (ESourceSelector *selector,
dd->list = cal_comp_selection_get_string_list (selection_data);
e_client_selector_get_client (
- E_CLIENT_SELECTOR (selector), destination, NULL,
+ E_CLIENT_SELECTOR (selector), destination, FALSE, NULL,
client_connect_for_drop_cb, dd);
return TRUE;
diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c
index f6198f47d9..23b82e642f 100644
--- a/calendar/gui/e-task-list-selector.c
+++ b/calendar/gui/e-task-list-selector.c
@@ -217,7 +217,7 @@ task_list_selector_process_data (ESourceSelector *selector,
if (source != NULL) {
e_client_selector_get_client (
- E_CLIENT_SELECTOR (selector), source, NULL,
+ E_CLIENT_SELECTOR (selector), source, FALSE, NULL,
client_connect_cb, g_strdup (old_uid));
g_object_unref (source);
}
@@ -372,7 +372,7 @@ task_list_selector_data_dropped (ESourceSelector *selector,
dd->list = cal_comp_selection_get_string_list (selection_data);
e_client_selector_get_client (
- E_CLIENT_SELECTOR (selector), destination, NULL,
+ E_CLIENT_SELECTOR (selector), destination, FALSE, NULL,
client_connect_for_drop_cb, dd);
return TRUE;