Changeset 1272

Timestamp:

11/28/06 21:54:18

Author:

pvanhoof

Message:

Added a few enums for error reporting

Files:

• trunk/bindings/python/tinymail.defs.extra (modified) (1 diff)
• trunk/bindings/python/tinymail.override (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (2 diffs)
• trunk/libtinymail/tny-error.c (modified) (1 diff)
• trunk/libtinymail/tny-error.h (modified) (3 diffs)

trunk/bindings/python/tinymail.defs.extra

@@ +1 @@
+(define-enum ErrorDomain
+  (in-module "Tny")
+  (c-name "TnyErrorDomain")
+  (gtype-id "TNY_TYPE_ERROR_DOMAIN")
+  (values
+    '("folder_error" "TNY_FOLDER_ERROR")
+    '("folder_store_error" "TNY_FOLDER_STORE_ERROR")
+    '("transport_account_error" "TNY_TRANSPORT_ACCOUNT_ERROR")
+  )
+)
+
+(define-enum Error
+  (in-module "Tny")
+  (c-name "TnyError")
+  (gtype-id "TNY_TYPE_ERROR")
+  (values
+        '("folder_error_expunge" "TNY_FOLDER_ERROR_EXPUNGE")
+        '("folder_error_remove_msg" "TNY_FOLDER_ERROR_REMOVE_MSG")
+        '("folder_error_add_msg" "TNY_FOLDER_ERROR_ADD_MSG")
+        '("folder_error_refresh" "TNY_FOLDER_ERROR_REFRESH")
+        '("folder_error_get_msg" "TNY_FOLDER_ERROR_GET_MSG")
+        '("folder_error_transfer_msgs" "TNY_FOLDER_ERROR_TRANSFER_MSGS")
+        '("folder_error_set_name" "TNY_FOLDER_ERROR_SET_NAME")
+        '("folder_store_error_remove_folder" "TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER")
+        '("folder_store_error_get_folders" "TNY_FOLDER_STORE_ERROR_GET_FOLDERS")
+        '("folder_store_error_create_folder" "TNY_FOLDER_STORE_ERROR_CREATE_FOLDER")
+        '("transport_account_error_send" "TNY_TRANSPORT_ACCOUNT_ERROR_SEND")
+  )
+)
+
-(define-enum GetAccountsRequestType
-  (in-module "Tny")

trunk/bindings/python/tinymail.override

@@ -5 +5 @@
-#include <pygobject.h>
-
+#include <tny-error.h>
-#include <tny-account.h>
-#include <tny-account-store.h>

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

@@ -110 +110 @@
-        {
-                g_set_error (err, TNY_TRANSPORT_ERROR, 
-ERROR_ACCOUNT
+ACCOUNT_ERROR
-                        camel_exception_get_description (&ex));
-
@@ -146 +146 @@
-        {
-                g_set_error (err, TNY_TRANSPORT_ERROR, 
-ERROR_ACCOUNT
+ACCOUNT_ERROR
-                        camel_exception_get_description (&ex));
-        }

trunk/libtinymail/tny-error.c

@@ +1 @@
+/* libtinymail - The Tiny Mail base library
+ * Copyright (C) 2006-2007 Philip Van Hoof <pvanhoof@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with self library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <tny-error.h>
+
+GType
+tny_error_domain_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_FOLDER_ERROR, "TNY_FOLDER_ERROR", "folder_error" },
+      { TNY_FOLDER_STORE_ERROR, "TNY_FOLDER_STORE_ERROR", "folder_store_error" },
+      { TNY_TRANSPORT_ERROR, "TNY_TRANSPORT_ERROR", "transport_error" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyErrorDomain", values);
+  }
+  return etype;
+}
+
+
+
+GType
+tny_error_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_FOLDER_ERROR_EXPUNGE, "TNY_FOLDER_ERROR_EXPUNGE", "folder_error_expunge" },
+      { TNY_FOLDER_ERROR_REMOVE_MSG, "TNY_FOLDER_ERROR_REMOVE_MSG", "folder_error_remove_msg" },
+      { TNY_FOLDER_ERROR_ADD_MSG, "TNY_FOLDER_ERROR_ADD_MSG", "folder_error_add_msg" },
+      { TNY_FOLDER_ERROR_REFRESH, "TNY_FOLDER_ERROR_REFRESH", "folder_error_refresh" },
+      { TNY_FOLDER_ERROR_GET_MSG, "TNY_FOLDER_ERROR_GET_MSG", "folder_error_get_msg" },
+      { TNY_FOLDER_ERROR_TRANSFER_MSGS, "TNY_FOLDER_ERROR_TRANSFER_MSGS", "folder_error_transfer_msgs" },
+      { TNY_FOLDER_ERROR_SET_NAME, "TNY_FOLDER_ERROR_SET_NAME", "folder_error_set_name" },
+
+      { TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER, "TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER", "folder_store_error_remove_folder" },
+      { TNY_FOLDER_STORE_ERROR_GET_FOLDERS, "TNY_FOLDER_STORE_ERROR_GET_FOLDERS", "folder_store_error_get_folders" },
+      { TNY_FOLDER_STORE_ERROR_CREATE_FOLDER, "TNY_FOLDER_STORE_ERROR_CREATE_FOLDER", "folder_store_error_create_folder" },
+
+      { TNY_TRANSPORT_ACCOUNT_ERROR_SEND, "TNY_TRANSPORT_ACCOUNT_ERROR_SEND", "transport_error_account_send" },
+
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyError", values);
+  }
+}

trunk/libtinymail/tny-error.h

@@ -22 +22 @@
-
-#include <glib.h>
+#include <glib-object.h>
-#include <tny-shared.h>
+
+#define TNY_TYPE_ERROR_DOMAIN (tny_error_domain_get_type())
-
-enum _TnyErrorDomain
@@ -30 +33 @@
-        TNY_TRANSPORT_ERROR
-};
+
+#define TNY_TYPE_ERROR (tny_error_get_type())
-
-enum _TnyError 
@@ -45 +50 @@
-        TNY_FOLDER_STORE_ERROR_CREATE_FOLDER,
-
-ERROR_ACCOUNT
+ACCOUNT_ERROR
-};
+
+GType tny_error_domain_get_type (void);
+GType tny_error_get_type (void);
-
-