diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-05-13 01:47:16 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-05-13 01:47:16 +0800 |
| commit | d46ad6d3cd44c3c9b730566cbd7719c2961a9bc9 (patch) | |
| tree | bdc2d2362021b2da8b8b0eaab55ca28af61122ca /addressbook | |
| parent | 4508696844c20530bdf7fe6150c432eb16a9c77b (diff) | |
| download | gsoc2013-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 'addressbook')
| -rw-r--r-- | addressbook/addressbook.error.xml | 5 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-selector.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml index 18e00d8a75..1e078575cb 100644 --- a/addressbook/addressbook.error.xml +++ b/addressbook/addressbook.error.xml @@ -65,6 +65,11 @@ <secondary>{0}</secondary> </error> + <error id="refresh-error" type="error"> + <_primary>Failed to refresh address book '{0}'</_primary> + <secondary>{1}</secondary> + </error> + <error id="prompt-save" type="question" default="GTK_RESPONSE_YES"> <_primary>Would you like to save your changes?</_primary> <_secondary>You have made modifications to this contact. Do you want to save these changes?</_secondary> diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c index 4b044867c9..f90f167890 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.c +++ b/addressbook/gui/widgets/e-addressbook-selector.c @@ -327,7 +327,7 @@ addressbook_selector_data_dropped (ESourceSelector *selector, merge_context->pending_adds = TRUE; e_client_selector_get_client ( - E_CLIENT_SELECTOR (selector), destination, NULL, + E_CLIENT_SELECTOR (selector), destination, FALSE, NULL, target_client_connect_cb, merge_context); return TRUE; |