callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Defined and using new error code for displayig offline state of Evolution.

Browse Source 
Fixes #344270.

svn path=/trunk/; revision=32127
This commit is contained in:
Sushma Rai
2006-06-13 10:15:40 +00:00
parent 2511403367
commit 48de88a67b
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/exchange-operations/ChangeLog
View File

@ -1,3 +1,14 @@
2006-06-13 Sushma Rai <rsushma@novell.com>
* org-gnome-exchange-operations.error.xml: defined a new error code and
error string, for displaying in offline state.
* exchange-folder.c (org_gnome_exchange_folder_ab_unsubscribe): Display
proper error in offline mode.
(org_gnome_exchange_folder_unsubscribe): Similar.
(org_gnome_exchange_folder_subscription): Similar.
Fixes #344270.
2006-06-07 Sushma Rai <rsushma@novell.com>
* exchange-folder-subscription.c (create_folder_subscription_dialog):

25
plugins/exchange-operations/exchange-folder.c
View File

@ -446,12 +446,7 @@ org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
g_warning ("Config listener not found");
return;
} else if (mode == OFFLINE_MODE) {
g_warning ("Unsubscribe to Other User's Folder is not allowed in Offline mode\n");
/* FIXME:
I think throwing an error dialog is not allowed
because of UI freeze.
e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL);
*/
e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
return;
}
@ -506,12 +501,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
g_warning ("Config listener not found");
return;
} else if (mode == OFFLINE_MODE) {
g_warning ("Unsubscribe to Other User's Folder is not allowed in Offline mode\n");
/* FIXME:
I think throwing an error dialog is not allowed
because of UI freeze.
e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL);
*/
e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
return;
}
@ -562,12 +552,11 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
return;
}
else if (mode == OFFLINE_MODE) {
g_warning ("Subscribe to Other User's Folder is not allowed in Offline mode\n");
/* FIXME:
I think throwing an error dialog is not allowed
because of UI freeze.
e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL);
*/
/* Translators: this error code can be used for any operation
* (like subscribing to other user's folders, unsubscribing
* etc,) which can not be performed in offline mode
*/
e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
return;
}

5
plugins/exchange-operations/org-gnome-exchange-operations.error.xml
View File

@ -48,6 +48,11 @@
<_secondary>Cannot display folders.</_secondary>
</error>
<error id="account-offline-generic" type="info">
<_primary>Exchange Account is offline.</_primary>
<_secondary>Cannot perform the operation.</_secondary>
</error>
<error id="password-incorrect" type="error">
<_primary>Could not authenticate to server.</_primary>
<_secondary>Make sure the username and password are correct and try again.</_secondary>