Changeset 2335

Timestamp:

07/01/07 20:12:33

Author:

pvanhoof

Message:

Fixed the Python bindings

Files:

• trunk/bindings/python/Makefile.am (modified) (6 diffs)
• trunk/bindings/python/tinymail-camel.defs.extra (deleted)
• trunk/bindings/python/tinymail-camel.override (modified) (3 diffs)
• trunk/bindings/python/tinymail-platform.defs.extra (deleted)
• trunk/bindings/python/tinymail.defs.extra (deleted)
• trunk/bindings/python/tinymail.override (modified) (3 diffs)
• trunk/bindings/python/tinymailui-gtk.defs.extra (deleted)
• trunk/bindings/python/tinymailui-gtk.override (modified) (2 diffs)
• trunk/bindings/python/tinymailui.defs.extra (deleted)
• trunk/libtinymail-camel/tny-stream-camel.h (modified) (1 diff)
• trunk/libtinymail/tny-account-store.c (modified) (1 diff)
• trunk/libtinymail/tny-account-store.h (modified) (1 diff)
• trunk/libtinymail/tny-account.c (modified) (1 diff)
• trunk/libtinymail/tny-account.h (modified) (1 diff)
• trunk/libtinymail/tny-device.c (modified) (1 diff)
• trunk/libtinymail/tny-device.h (modified) (1 diff)
• trunk/libtinymail/tny-folder-change.c (modified) (1 diff)
• trunk/libtinymail/tny-folder-change.h (modified) (1 diff)
• trunk/libtinymail/tny-folder-store-change.c (modified) (1 diff)
• trunk/libtinymail/tny-folder-store-change.h (modified) (1 diff)
• trunk/libtinymail/tny-folder.c (modified) (1 diff)
• trunk/libtinymail/tny-folder.h (modified) (2 diffs)
• trunk/libtinymail/tny-header.c (modified) (1 diff)
• trunk/libtinymail/tny-header.h (modified) (1 diff)
• trunk/libtinymail/tny-status.h (modified) (1 diff)

trunk/bindings/python/Makefile.am

@@ -71 +71 @@
-        filter.py \
-        scanvirtuals.py \
-        tinymail.defs.extra \
-        tinymail.override \
-        tinymailui.defs.extra \
-        tinymailui.override \
-        tinymailui-gtk.override \
-        tinymailui-gtk.defs.extra \
-        tinymail-platform.defs.extra \
-        tinymail-platform.override \
-        tinymail-camel.defs.extra \
-        tinymail-camel.override
-
@@ -125 +120 @@
-
-
-
-
-
-
-
+
+
-
-#       $(PYTHON) $(top_srcdir)/bindings/python/scanvirtuals.py
@@ -145 +137 @@
-        $(top_srcdir)/libtinymailui/tny-summary-view.h
-
-
-
-
-
-
+
+
-
-#       $(PYTHON) $(top_srcdir)/bindings/python/scanvirtuals.py
@@ -171 +160 @@
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-text-mime-part-view.h
-
-
-
-
-
-
+
+
-
-#       $(PYTHON) $(top_srcdir)/bindings/python/scanvirtuals.py
@@ -182 +168 @@
-# tinymail_platform_h_files = `ls $(top_srcdir)/$(PLATFORMDIR)/*h | grep -v \\\-priv | xargs`
-
-tinymail-platform.defs.extra $(top_srcdir)/bindings/python/filter.py
+
-        $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py \
-
-
-
-
+
-
-#       $(PYTHON) $(top_srcdir)/bindings/python/scanvirtuals.py
@@ -218 +201 @@
-
-
-
-
-
-
-
+
+
-
-#       $(PYTHON) $(top_srcdir)/bindings/python/scanvirtuals.py

trunk/bindings/python/tinymail-camel.override

@@ -24 +24 @@
-#include <tny-send-queue.h>
-
-
-#include <tny-camel-account.h>
-#include <tny-camel-folder.h>
@@ -48 +47 @@
-#include <tny-camel-partial-msg-receive-strategy.h>
-#include <tny-camel-mem-stream.h>
+#include <tny-camel-pop-remote-msg-remove-strategy.h>
-
-#define NO_IMPORT_PYGOBJECT
@@ -69 +69 @@
-import tinymail.FolderStore as PyTnyFolderStore_Type
-import tinymail.StoreAccount as PyTnyStoreAccount_Type
+import tinymail.Lockable as PyTnyLockable_Type
+import tinymail.camel.CamelSession as PyCamelSession_Type
+import tinymail.camel.CamelStream as PyCamelStream_Type
+
+

trunk/bindings/python/tinymail.override

@@ -4 +4 @@
-#include <Python.h>
-#include <pygobject.h>
+
+#include <tny-shared.h>
-
-#include <tny-error.h>
@@ -17 +19 @@
-#include <tny-msg.h>
-#include <tny-mime-part.h>
-#include <tny-shared.h>
-#include <tny-store-account.h>
-#include <tny-stream.h>
@@ -38 +39 @@
-#include <tny-merge-folder.h>
-#include <tny-combined-account.h>
-
+
+
+
+
+
+
+
+
-#define NO_IMPORT_PYGOBJECT
-#include "pygobject.h"

trunk/bindings/python/tinymailui-gtk.override

@@ -21 +21 @@
-#include <tny-gtk-text-mime-part-view.h>
-#include <tny-gtk-lockable.h>
+#include <tny-gtk-password-dialog.h>
-
-%%
@@ -49 +50 @@
-import tinymail.ui.MimePartSaveStrategy as PyTnyMimePartSaveStrategy_Type
-import tinymail.ui.MsgView as PyTnyMsgView_Type
+

trunk/libtinymail-camel/tny-stream-camel.h

@@ -29 +29 @@
-G_BEGIN_DECLS
-
+/* Strange Python binding generator wants this */
+#define TNY_TYPE_STREAM_CAMEL_STREAM     (tny_stream_camel_get_type ())
+
-#define TNY_TYPE_STREAM_CAMEL     (tny_stream_camel_get_type ())
-#define TNY_STREAM_CAMEL(obj)     (CAMEL_CHECK_CAST((obj), TNY_TYPE_STREAM_CAMEL_STREAM, TnyStreamCamel))

trunk/libtinymail/tny-account-store.c

@@ -564 +564 @@
-}
-
+
+
+/**
+ * tny_account_store_signal_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_account_store_signal_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_ACCOUNT_STORE_ACCOUNT_CHANGED, "TNY_ACCOUNT_STORE_ACCOUNT_CHANGED", "changed" }
+      { TNY_ACCOUNT_STORE_ACCOUNT_INSERTED, "TNY_ACCOUNT_STORE_ACCOUNT_INSERTED", "inserted" }
+      { TNY_ACCOUNT_STORE_ACCOUNT_REMOVED, "TNY_ACCOUNT_STORE_ACCOUNT_REMOVED", "removed" }
+      { TNY_ACCOUNT_STORE_ACCOUNTS_RELOADED, "TNY_ACCOUNT_STORE_ACCOUNTS_RELOADED", "reloaded" }
+      { TNY_ACCOUNT_STORE_CONNECTING_STARTED, "TNY_ACCOUNT_STORE_CONNECTING_STARTED", "started" }
+      { TNY_ACCOUNT_STORE_CONNECTING_FINISHED, "TNY_ACCOUNT_STORE_CONNECTING_FINISHED", "finished" }
+      { TNY_ACCOUNT_STORE_LAST_SIGNAL,  "TNY_ACCOUNT_STORE_LAST_SIGNAL", "last-signal" }
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyAccountStoreSignal", values);
+  }
+  return etype;
+}

trunk/libtinymail/tny-account-store.h

@@ -31 +31 @@
-#define TNY_IS_ACCOUNT_STORE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_ACCOUNT_STORE))
-#define TNY_ACCOUNT_STORE_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), TNY_TYPE_ACCOUNT_STORE, TnyAccountStoreIface))
+
+#define TNY_TYPE_ACCOUNT_STORE_SIGNAL (tny_account_store_signal_get_type())
-
-enum _TnyAccountStoreSignal

trunk/libtinymail/tny-account.c

@@ -964 +964 @@
-}
-
+
+/**
+ * tny_connection_status_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_connection_status_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_CONNECTION_STATUS_DISCONNECTED, "TNY_CONNECTION_STATUS_DISCONNECTED", "disconnected" },
+      { TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN, "TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN", "disconnected-broken" },
+      { TNY_CONNECTION_STATUS_CONNECTED_BROKEN, "TNY_CONNECTION_STATUS_CONNECTED_BROKEN", "connected-broken" },
+      { TNY_CONNECTION_STATUS_CONNECTED, "TNY_CONNECTION_STATUS_CONNECTED", "connected" },
+      { TNY_CONNECTION_STATUS_RECONNECTING, "TNY_CONNECTION_STATUS_RECONNECTING", "reconnecting" },
+      { TNY_CONNECTION_STATUS_INIT, "TNY_CONNECTION_STATUS_INIT", "init" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyConnectionStatus", values);
+  }
+  return etype;
+}
+
+

trunk/libtinymail/tny-account.h

@@ -42 +42 @@
-typedef enum _TnyConnectionStatus TnyConnectionStatus;
-#endif
+
+#define TNY_TYPE_CONNECTION_STATUS (tny_connection_status_get_type())
-
-enum _TnyConnectionStatus

trunk/libtinymail/tny-device.c

@@ -235 +235 @@
-        return type;
-}
+
+
+
+/**
+ * tny_device_signal_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_device_signal_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_DEVICE_CONNECTION_CHANGED, "TNY_DEVICE_CONNECTION_CHANGED", "connection-changed" },
+      { TNY_DEVICE_LAST_SIGNAL, "TNY_DEVICE_LAST_SIGNAL", "last-signal" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyDeviceSignal", values);
+  }
+  return etype;
+}

trunk/libtinymail/tny-device.h

@@ -31 +31 @@
-#define TNY_IS_DEVICE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_DEVICE))
-#define TNY_DEVICE_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), TNY_TYPE_DEVICE, TnyDeviceIface))
+
+#define TNY_TYPE_DEVICE_SIGNAL (tny_device_signal_get_type())
-
-enum _TnyDeviceSignal

trunk/libtinymail/tny-folder-change.c

@@ -532 +532 @@
-}
-
+
+/**
+ * tny_folder_change_changed_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_folder_change_changed_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT, "TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT", "all-count" },
+      { TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT, "TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT", "unread-count" },
+      { TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS, "TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS","added-headers" },
+      { TNY_FOLDER_CHANGE_CHANGED_REMOVED_HEADERS, "TNY_FOLDER_CHANGE_CHANGED_REMOVED_HEADERS", "removed-headers" },
+      { TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME, "TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME", "rename" },
+      { TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED, "TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED", "received" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyFolderChangeChanged", values);
+  }
+  return etype;
+}
+

trunk/libtinymail/tny-folder-change.h

@@ -40 +40 @@
-typedef struct _TnyFolderChangeClass TnyFolderChangeClass;
-#endif
+
+
+#define TNY_TYPE_FOLDER_CHANGE_CHANGED (tny_folder_change_changed_get_type())
-
-enum _TnyFolderChangeChanged

trunk/libtinymail/tny-folder-store-change.c

@@ -348 +348 @@
-}
-
+
+/**
+ * tny_folder_store_change_changed_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_folder_store_change_changed_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS, "TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS", "created-folders" },
+      { TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS, "TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS", "removed-folders" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyFolderStoreChangeChanged", values);
+  }
+  return etype;
+}

trunk/libtinymail/tny-folder-store-change.h

@@ -41 +41 @@
-#endif
-
+#define TNY_TYPE_FOLDER_STORE_CHANGE_CHANGED (tny_folder_store_change_changed_get_type())
+
-enum _TnyFolderStoreChangeChanged
-{

trunk/libtinymail/tny-folder.c

@@ -1326 +1326 @@
-  return etype;
-}
+
+
+
+/**
+ * tny_folder_caps_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_folder_caps_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_FOLDER_CAPS_WRITABLE, "TNY_FOLDER_CAPS_WRITABLE", "writable" },
+      {TNY_FOLDER_CAPS_PUSHEMAIL, "TNY_FOLDER_CAPS_PUSHEMAIL", "pushemail" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyFolderCaps", values);
+  }
+  return etype;
+}
+
+
+/**
+ * tny_folder_signal_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_folder_signal_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_FOLDER_FOLDER_INSERTED, "TNY_FOLDER_FOLDER_INSERTED", "inserted" },
+      { TNY_FOLDER_FOLDERS_RELOADED, "TNY_FOLDER_FOLDERS_RELOADED", "reloaded" },
+      { TNY_FOLDER_LAST_SIGNAL, "TNY_FOLDER_LAST_SIGNAL", "last-signal" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyFolderSignal", values);
+  }
+  return etype;
+}

trunk/libtinymail/tny-folder.h

@@ -44 +44 @@
-#endif
-
+#define TNY_TYPE_FOLDER_SIGNAL (tny_folder_signal_get_type())
+
-enum _TnyFolderSignal
-{
@@ -54 +56 @@
-
-#define TNY_TYPE_FOLDER_TYPE (tny_folder_type_get_type())
+
+#define TNY_TYPE_FOLDER_CAPS (tny_folder_caps_get_type())
-
-enum _TnyFolderCaps

trunk/libtinymail/tny-header.c

@@ -587 +587 @@
-  return etype;
-}
+
+
+/**
+ * tny_header_priority_flags_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_header_priority_flags_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_HEADER_FLAG_HIGH_PRIORITY, "TNY_HEADER_FLAG_HIGH_PRIORITY", "high-priority" },
+      { TNY_HEADER_FLAG_NORMAL_PRIORITY, "TNY_HEADER_FLAG_NORMAL_PRIORITY", "normal-priority" },
+      { TNY_HEADER_FLAG_LOW_PRIORITY, "TNY_HEADER_FLAG_LOW_PRIORITY", "low-priority" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyHeaderPriorityFlags", values);
+  }
+  return etype;
+}

trunk/libtinymail/tny-header.h

@@ -68 +68 @@
-};
-
+#define TNY_TYPE_HEADER_PRIORITY_FLAGS (tny_header_priority_flags_get_type())
+
-enum _TnyHeaderPriorityFlags 
-{

trunk/libtinymail/tny-status.h

@@ -38 +38 @@
-};
-
- (tny_status
+_CODE (tny_status_code
-
-enum _TnyStatusCode