Changeset 3654

Timestamp:

05/12/08 12:15:05

Author:

robtaylor

Message:

• libtinymail-camel/tny-camel-bs-msg-receive-strategy.c:
  
• libtinymail-camel/tny-camel-folder.c:
  
• libtinymail-camel/tny-camel-nntp-folder.c:
  
• libtinymail-camel/tny-camel-mime-part.c:
  
• libtinymail-camel/tny-camel-send-queue.c:
  
• libtinymail-camel/tny-camel-pop-store-account.c:
  
• libtinymail-camel/tny-camel-pop-folder.c:
  
• libtinymail-camel/tny-camel-common.c:
  
• libtinymail-camel/tny-camel-nntp-store-account.c:
  
• libtinymail-camel/tny-camel-store-account.c:
  
• libtinymail-camel/tny-camel-transport-account.c:
  
• libtinymail-camel/tny-camel-account.c:
  
• libtinymail/tny-error.c:
  
• libtinymail/tny-error.h:
  
• libtinymail/tny-merge-folder.c: Fix tinymail's GError usage. Use an
  

actual GQuark for the domain, have one domain for tinymail as a whole.
Removes the pointless GType for the error.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-bs-msg-receive-strategy.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-common.c (modified) (22 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (26 diffs)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-nntp-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-nntp-store-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-pop-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-pop-store-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (11 diffs)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (4 diffs)
• trunk/libtinymail/tny-error.c (modified) (1 diff)
• trunk/libtinymail/tny-error.h (modified) (2 diffs)
• trunk/libtinymail/tny-merge-folder.c (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-05-12  Rob Taylor  <rob.taylor@codethink.co.uk>
+
+        * libtinymail-camel/tny-camel-bs-msg-receive-strategy.c:
+        * libtinymail-camel/tny-camel-folder.c:
+        * libtinymail-camel/tny-camel-nntp-folder.c:
+        * libtinymail-camel/tny-camel-mime-part.c:
+        * libtinymail-camel/tny-camel-send-queue.c:
+        * libtinymail-camel/tny-camel-pop-store-account.c:
+        * libtinymail-camel/tny-camel-pop-folder.c:
+        * libtinymail-camel/tny-camel-common.c:
+        * libtinymail-camel/tny-camel-nntp-store-account.c:
+        * libtinymail-camel/tny-camel-store-account.c:
+        * libtinymail-camel/tny-camel-transport-account.c:
+        * libtinymail-camel/tny-camel-account.c:
+        * libtinymail/tny-error.c:
+        * libtinymail/tny-error.h:
+        * libtinymail/tny-merge-folder.c: Fix tinymail's GError usage. Use an
+        actual GQuark for the domain, have one domain for tinymail as a whole.
+        Removes the pointless GType for the error.
+
-2008-05-12  Sergio Villar Senin  <svillar@igalia.com>
-

trunk/libtinymail-camel/tny-camel-account.c

@@ -1609 +1609 @@
-                        camel_exception_clear (priv->ex);
-                } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_CONNECT,
-                                "Account not yet fully configured. "
@@ -2067 +2067 @@
-
-        if (!_tny_session_check_operation (priv->session, TNY_ACCOUNT (self), &err, 
-SERVICE_ERROR
+ERROR_DOMAIN
-        {
-                if (callback) {

trunk/libtinymail-camel/tny-camel-bs-msg-receive-strategy.c

@@ -94 +94 @@
-
-                        if (fd == -1) {
-IO_ERROR, 
+ERROR_DOMAIN,
-                                        TNY_IO_ERROR_READ,
-                                        "Can't open %s for reading", filename);

trunk/libtinymail-camel/tny-camel-common.c

@@ -332 +332 @@
-                /* The From/To address is not well formed while 
-                 * sending or NNTP authentication error*/
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_PROTOCOL,
-                        camel_exception_get_description (ex));
@@ -338 +338 @@
-
-        case CAMEL_EXCEPTION_SYSTEM:
-SYSTEM_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SYSTEM_ERROR_UNKNOWN,
-                        camel_exception_get_description (ex));
@@ -344 +344 @@
-
-        case CAMEL_EXCEPTION_USER_CANCEL:
-SYSTEM_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SYSTEM_ERROR_CANCEL,
-                        camel_exception_get_description (ex));
@@ -351 +351 @@
-        /* Usually fs space problems */
-        case CAMEL_EXCEPTION_SYSTEM_IO_WRITE:
-IO_ERROR, 
+ERROR_DOMAIN,
-                        TNY_IO_ERROR_WRITE,
-                        camel_exception_get_description (ex));
@@ -357 +357 @@
-
-        case CAMEL_EXCEPTION_SYSTEM_MEMORY:
-IO_ERROR, 
+ERROR_DOMAIN,
-                        TNY_IO_ERROR_WRITE,
-                        camel_exception_get_description (ex));
@@ -364 +364 @@
-        /* Usually fs corruption problems */
-        case CAMEL_EXCEPTION_SYSTEM_IO_READ:
-IO_ERROR, 
+ERROR_DOMAIN,
-                        TNY_IO_ERROR_READ,
-                        camel_exception_get_description (ex));
@@ -370 +370 @@
-
-        case CAMEL_EXCEPTION_FOLDER_UID_NOT_AVAILABLE: /* message not available atm */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE,
-                        camel_exception_get_description (ex));
@@ -376 +376 @@
-
-        case CAMEL_EXCEPTION_FOLDER_INVALID_UID: /* message does not exist */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_NO_SUCH_MESSAGE,
-                        camel_exception_get_description (ex));
@@ -382 +382 @@
-
-        case CAMEL_EXCEPTION_SERVICE_NOT_SUPPORTED:
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        camel_exception_get_description (ex));
@@ -393 +393 @@
-        case CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION:
-        case CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID: /* destroyed and recreated on server */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNKNOWN,
-                        camel_exception_get_description (ex));
@@ -399 +399 @@
-
-        case CAMEL_EXCEPTION_FOLDER_RENAME: /* folder rename error */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_FOLDER_RENAME,
-                        camel_exception_get_description (ex));
@@ -406 +406 @@
-        case CAMEL_EXCEPTION_FOLDER_NON_EMPTY: /* folder delete error */
-        case CAMEL_EXCEPTION_FOLDER_DELETE:
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_FOLDER_REMOVE,
-                        camel_exception_get_description (ex));
@@ -412 +412 @@
-
-        case CAMEL_EXCEPTION_FOLDER_CREATE: /* folder create error */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_FOLDER_CREATE,
-                        camel_exception_get_description (ex));
@@ -418 +418 @@
-
-        case CAMEL_EXCEPTION_STORE_NO_FOLDER: /* Folder does not exist */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_FOLDER_IS_UNKNOWN,
-                        camel_exception_get_description (ex));
@@ -425 +425 @@
-        case CAMEL_EXCEPTION_SERVICE_PROTOCOL:
-                /* For example BAD from IMAP server */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_PROTOCOL,
-                        camel_exception_get_description (ex));
@@ -432 +432 @@
-        case CAMEL_EXCEPTION_STORE_NULL:
-        case CAMEL_EXCEPTION_STORE_INVALID: /* unused */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNKNOWN,
-                        camel_exception_get_description (ex));
@@ -438 +438 @@
-
-        case CAMEL_EXCEPTION_SERVICE_INVALID:
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_PROTOCOL,
-                        camel_exception_get_description (ex));
@@ -446 +446 @@
-        case CAMEL_EXCEPTION_SERVICE_UNAVAILABLE:
-                /* You must be working online */
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNAVAILABLE,
-                        camel_exception_get_description (ex));
@@ -453 +453 @@
-        case CAMEL_EXCEPTION_SERVICE_CONNECT:
-        case CAMEL_EXCEPTION_SYSTEM_HOST_LOOKUP_FAILED:
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_CONNECT,
-                        camel_exception_get_description (ex));
@@ -459 +459 @@
-
-        case CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE:
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_AUTHENTICATE,
-                        camel_exception_get_description (ex));
@@ -465 +465 @@
-
-        case CAMEL_EXCEPTION_SERVICE_CERTIFICATE:
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_CERTIFICATE,
-                        camel_exception_get_description (ex));
@@ -472 +472 @@
-        case CAMEL_EXCEPTION_SERVICE_NULL:
-        case CAMEL_EXCEPTION_SERVICE_URL_INVALID:
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNKNOWN,
-                        camel_exception_get_description (ex));
-        break;
-        default:
-SYSTEM_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SYSTEM_ERROR_UNKNOWN,
-                        camel_exception_get_description (ex));

trunk/libtinymail-camel/tny-camel-folder.c

@@ -760 +760 @@
-
-        } else {
-MIME_ERROR, 
+ERROR_DOMAIN,
-                        TNY_MIME_ERROR_MALFORMED,
-                        _("Malformed message"));
@@ -1013 +1013 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_ADD_MSG))
-                return;
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_ADD_MSG,
-                        "Folder not ready for adding messages");
@@ -1074 +1074 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_REMOVE_MSG))
-                return;
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_REMOVE_MSG,
-                        _("Folder not ready for removing"));
@@ -1275 +1275 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_REMOVE_MSG))
-                return;
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_REMOVE_MSG,
-                        _("Folder not ready for removing"));
@@ -1539 +1539 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_SYNC))
-                return;
@@ -1666 +1666 @@
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_SYNC,
-                        "Folder not ready for synchronization");
@@ -2049 +2049 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_REFRESH))
-                return;
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_REFRESH,
-                        _("Folder not ready for refresh"));
@@ -2300 +2300 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), priv->account, err, 
-SERVICE_ERROR
+ERROR_DOMAIN
-                return;
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_REFRESH,
-                        _("Folder not ready for getting headers"));
@@ -2828 +2828 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_GET_MSG))
-                return NULL;
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_GET_MSG,
-                        _("Folder not ready for getting messages"));
@@ -2897 +2897 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_GET_MSG))
-                return NULL;
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_GET_MSG,
-                        _("Folder not ready for finding messages"));
@@ -2935 +2935 @@
-                info = camel_folder_get_message_info (priv->folder, uid);
-                if (info == NULL) {
-SERVICE_ERROR
+ERROR_DOMAIN
-                                     _("Message uid not found in folder"));
-                        retval = NULL;
@@ -2955 +2955 @@
-
-        } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_GET_MSG,
-                                _("This url string is malformed"));
@@ -3188 +3188 @@
-                        g_object_unref (a_store);
-                } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_UNKNOWN,
-                                "The folder (%s) didn't have a parent, therefore "
@@ -3364 +3364 @@
-        if (del && priv->reason_to_live != 0)
-        {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_STATE,
-                        "You should not use this operation with del=TRUE "
@@ -3453 +3453 @@
-                                        {
-                                                if (!camel_exception_is_set (&ex))
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                                                TNY_SERVICE_ERROR_COPY, 
-                                                                _("Folder not ready for copy"));
@@ -3578 +3578 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_COPY))
-                return NULL;
@@ -3584 +3584 @@
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_COPY,
-                        _("Folder not ready for copy"));
@@ -4007 +4007 @@
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_TRANSFER,
-                        _("Folder not ready for transfer"));
@@ -4014 +4014 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_TRANSFER))
-                return;
@@ -4068 +4068 @@
-                if (G_UNLIKELY (uid == NULL)) 
-                {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_TRANSFER,
-                                "You can only pass summary items as headers. "
@@ -4699 +4699 @@
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_FOLDER_REMOVE,
-                        _("Folder store not ready for removal"));
@@ -4893 +4893 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), priv->account, err, 
-SERVICE_ERROR
+ERROR_DOMAIN
-                return;
-
-        if (!priv->account) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_FOLDER_REMOVE,
-                        _("Folder store not ready for removing folders"));
@@ -4976 +4976 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_FOLDER_CREATE))
-                return NULL;
-
-        if (!name || strlen (name) <= 0) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_FOLDER_CREATE,
-                                _("Failed to create folder with no name"));
@@ -4989 +4989 @@
-
-        if (!priv->folder_name) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_FOLDER_CREATE,
-                                _("Failed to create folder. Invalid parent folder"));
@@ -5010 +5010 @@
-                        camel_exception_clear (&ex);
-                } else
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_FOLDER_CREATE,
-                                _("Unknown error while trying to create folder"));
@@ -5255 +5255 @@
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_GET_FOLDERS))
-                return;

trunk/libtinymail-camel/tny-camel-mime-part.c

@@ -669 +669 @@
-                             "tny_mime_part_construct first"));
-                camel_object_unref (cstream);
-MIME_ERROR, 
+ERROR_DOMAIN,
-                                TNY_MIME_ERROR_STATE,
-                                _("Mime part does not yet have a source stream, use "
@@ -686 +686 @@
-
-        if (bytes < 0) {
-IO_ERROR, 
+ERROR_DOMAIN,
-                                TNY_IO_ERROR_WRITE,
-                                strerror (errno));
@@ -789 +789 @@
-        
-        if (bytes < 0) {
-IO_ERROR, 
+ERROR_DOMAIN,
-                                TNY_IO_ERROR_WRITE,
-                                strerror (errno));

trunk/libtinymail-camel/tny-camel-nntp-folder.c

@@ -61 +61 @@
-tny_camel_nntp_folder_remove_folder (TnyFolderStore *self, TnyFolder *folder, GError **err)
-{
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        "You can't use the tny_folder_store_remove_folder API "
@@ -73 +73 @@
-tny_camel_nntp_folder_create_folder (TnyFolderStore *self, const gchar *name, GError **err)
-{
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        "You can't use the tny_folder_store_create_folder "

trunk/libtinymail-camel/tny-camel-nntp-store-account.c

@@ -70 +70 @@
-tny_camel_nntp_store_account_remove_folder (TnyFolderStore *self, TnyFolder *folder, GError **err)
-{
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        "You can't use the tny_folder_store_remove_folder API "
@@ -82 +82 @@
-tny_camel_nntp_store_account_create_folder (TnyFolderStore *self, const gchar *name, GError **err)
-{
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        "You can't use the tny_folder_store_create_folder "

trunk/libtinymail-camel/tny-camel-pop-folder.c

@@ -78 +78 @@
-tny_camel_pop_folder_remove_folder (TnyFolderStore *self, TnyFolder *folder, GError **err)
-{
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        "You can't use the tny_folder_store_remove_folder "
@@ -90 +90 @@
-tny_camel_pop_folder_create_folder (TnyFolderStore *self, const gchar *name, GError **err)
-{
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        "You can't use the tny_folder_store_create_folder "

trunk/libtinymail-camel/tny-camel-pop-store-account.c

@@ -69 +69 @@
-tny_camel_pop_store_account_remove_folder (TnyFolderStore *self, TnyFolder *folder, GError **err)
-{
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        "You can't use the tny_folder_store_remove_folder API "
@@ -81 +81 @@
-tny_camel_pop_store_account_create_folder (TnyFolderStore *self, const gchar *name, GError **err)
-{
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_UNSUPPORTED,
-                        "You can't use the tny_folder_store_create_folder "

trunk/libtinymail-camel/tny-camel-send-queue.c

@@ -845 +845 @@
-                        if (!info->outbox || !info->sentbox) {
-
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                        TNY_SERVICE_ERROR_ADD_MSG, FOLDERSNOTREADY);
-                                g_warning (FOLDERSNOTREADY);
@@ -1034 +1034 @@
-                if (!outbox || !TNY_IS_FOLDER (outbox))
-                {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_ADD_MSG,
-                                _("Operating can't continue: send queue not ready "
@@ -1092 +1092 @@
-
-        if (!outbox || !TNY_IS_FOLDER (outbox)) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_ADD_MSG,
-                        _("Operating can't continue: send queue not ready "

trunk/libtinymail-camel/tny-camel-store-account.c

@@ -556 +556 @@
-                        camel_exception_clear (apriv->ex);
-                } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_CONNECT,
-                                "Account not yet fully configured. "
@@ -582 +582 @@
-                                camel_exception_clear (&ex);
-                        } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                        TNY_SERVICE_ERROR_CONNECT,
-                                        _("Unknown error while connecting"));
@@ -593 +593 @@
-
-        } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_CONNECT,
-                                _("Get and Forget password functions not yet set. "
@@ -1026 +1026 @@
-
-        if (!_tny_session_check_operation (apriv->session, TNY_ACCOUNT (self), err,
-SERVICE_ERROR
+ERROR_DOMAIN
-                return;
-
-        if (apriv->service == NULL || !CAMEL_IS_SERVICE (apriv->service))
-        {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_FOLDER_REMOVE,
-                                _("Account not ready for this operation."
@@ -1074 +1074 @@
-
-        if (!_tny_session_check_operation (apriv->session, TNY_ACCOUNT (self), err,
-SERVICE_ERROR
+ERROR_DOMAIN
-                return NULL;
-
-        if (!name || strlen (name) <= 0)
-        {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_FOLDER_CREATE,
-                                _("Failed to create folder with no name"));
@@ -1090 +1090 @@
-        if (apriv->service == NULL || !CAMEL_IS_SERVICE (apriv->service))
-        {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_FOLDER_CREATE,
-                                _("Account not ready for this operation. "
@@ -1355 +1355 @@
-
-        if (!_tny_session_check_operation (apriv->session, TNY_ACCOUNT (self), err, 
-SERVICE_ERROR
+ERROR_DOMAIN
-                return;
-
@@ -1363 +1363 @@
-        if (apriv->service == NULL || !CAMEL_IS_SERVICE (apriv->service))
-        {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_GET_FOLDERS,
-                                _("Account not ready for this operation. "
@@ -1738 +1738 @@
-
-        if (!_tny_session_check_operation (apriv->session, TNY_ACCOUNT (self), err, 
-SERVICE_ERROR
+ERROR_DOMAIN
-                return NULL;
-
-        if (apriv->service == NULL || !CAMEL_IS_SERVICE (apriv->service))
-        {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_GET_FOLDERS,
-                                _("Account not ready for this operation."
@@ -1822 +1822 @@
-                }
-        } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_GET_FOLDERS,
-                        _("Invalid URL string"));
@@ -2006 +2006 @@
-                if (callback) {
-                        GError *err = NULL;
-SYSTEM_ERROR
+ERROR_DOMAIN
-                                _("Internal error, account not ready"));
-                        callback ((TnyCamelAccount *) self, TRUE, err, user_data);

trunk/libtinymail-camel/tny-camel-transport-account.c

@@ -120 +120 @@
-                        camel_exception_clear (apriv->ex);
-                } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_CONNECT,
-                                _("Account not yet fully configured. "
@@ -135 +135 @@
-
-        } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_CONNECT,
-                                _("Get and Forget password functions not yet set "
@@ -199 +199 @@
-                        _tny_camel_exception_to_tny_error (&ex, err);
-                } else {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_AUTHENTICATE,