[PATCH] Use GPOINTER_TO_SIZE (once.retval) to retrieve GType values.

From: Simon Schubert <2 0x2c org>
To: tinymail-devel-list gnome org
Subject: [PATCH] Use GPOINTER_TO_SIZE (once.retval) to retrieve GType values.
Date: Fri, 05 Mar 2010 01:07:22 +0100

This fixes crashes on 64-bit machines.

Signed-off-by: Simon Schubert <2 0x2c org>
---
 ChangeLog                                          |    5 +++++
 libtinymail-acap/tny-acap-account-store.c          |    4 ++--
 libtinymail-camel/tny-camel-account.c              |    4 ++--
 libtinymail-camel/tny-camel-bs-mime-part.c         |    4 ++--
 libtinymail-camel/tny-camel-bs-msg-header.c        |    4 ++--
 .../tny-camel-bs-msg-receive-strategy.c            |    4 ++--
 libtinymail-camel/tny-camel-bs-msg.c               |    4 ++--
 .../tny-camel-default-connection-policy.c          |    4 ++--
 libtinymail-camel/tny-camel-folder.c               |    4 ++--
 .../tny-camel-full-msg-receive-strategy.c          |    4 ++--
 libtinymail-camel/tny-camel-header.c               |    4 ++--
 libtinymail-camel/tny-camel-html-to-text-stream.c  |    4 ++--
 libtinymail-camel/tny-camel-imap-folder.c          |    4 ++--
 libtinymail-camel/tny-camel-imap-store-account.c   |    4 ++--
 libtinymail-camel/tny-camel-mem-stream.c           |    4 ++--
 libtinymail-camel/tny-camel-mime-part.c            |    4 ++--
 libtinymail-camel/tny-camel-msg-header.c           |    4 ++--
 libtinymail-camel/tny-camel-msg-remove-strategy.c  |    4 ++--
 libtinymail-camel/tny-camel-msg.c                  |    4 ++--
 libtinymail-camel/tny-camel-nntp-folder.c          |    4 ++--
 libtinymail-camel/tny-camel-nntp-store-account.c   |    4 ++--
 .../tny-camel-partial-msg-receive-strategy.c       |    4 ++--
 libtinymail-camel/tny-camel-pop-folder.c           |    4 ++--
 .../tny-camel-pop-remote-msg-remove-strategy.c     |    4 ++--
 libtinymail-camel/tny-camel-pop-store-account.c    |    4 ++--
 libtinymail-camel/tny-camel-queue.c                |    4 ++--
 .../tny-camel-recover-connection-policy.c          |    4 ++--
 libtinymail-camel/tny-camel-send-queue.c           |    4 ++--
 libtinymail-camel/tny-camel-store-account.c        |    4 ++--
 libtinymail-camel/tny-camel-stream.c               |    4 ++--
 libtinymail-camel/tny-camel-transport-account.c    |    4 ++--
 libtinymail-gio/tny-gio-input-stream.c             |    4 ++--
 libtinymail-gio/tny-gio-output-stream.c            |    4 ++--
 .../tny-gnome-account-store.c                      |    4 ++--
 libtinymail-gnome-desktop/tny-gnome-device.c       |    4 ++--
 .../tny-gnome-platform-factory.c                   |    4 ++--
 libtinymail-gnomevfs/tny-vfs-stream.c              |    4 ++--
 libtinymail-gpe/tny-gpe-account-store.c            |    4 ++--
 libtinymail-gpe/tny-gpe-device.c                   |    4 ++--
 libtinymail-gpe/tny-gpe-platform-factory.c         |    4 ++--
 libtinymail-maemo/tny-maemo-account-store.c        |    4 ++--
 libtinymail-maemo/tny-maemo-conic-device.c         |    4 ++--
 libtinymail-maemo/tny-maemo-conic-dummy-device.c   |    4 ++--
 libtinymail-maemo/tny-maemo-device.c               |    4 ++--
 libtinymail-maemo/tny-maemo-noconic-device.c       |    4 ++--
 libtinymail-maemo/tny-maemo-platform-factory.c     |    4 ++--
 libtinymail-moblin/tny-moblin-account-store.c      |    4 ++--
 libtinymail-moblin/tny-moblin-device.c             |    4 ++--
 libtinymail-moblin/tny-moblin-platform-factory.c   |    4 ++--
 libtinymail-tp/tny-tp-mail-notifier.c              |    4 ++--
 libtinymail/tny-account-store.c                    |   16 ++++++++--------
 libtinymail/tny-account.c                          |   16 ++++++++--------
 libtinymail/tny-cached-file-stream.c               |    4 ++--
 libtinymail/tny-cached-file.c                      |    4 ++--
 libtinymail/tny-combined-account.c                 |    4 ++--
 libtinymail/tny-connection-policy.c                |    4 ++--
 libtinymail/tny-device.c                           |    8 ++++----
 libtinymail/tny-expunged-header.c                  |    4 ++--
 libtinymail/tny-folder-change.c                    |    8 ++++----
 libtinymail/tny-folder-monitor.c                   |    4 ++--
 libtinymail/tny-folder-observer.c                  |    4 ++--
 libtinymail/tny-folder-stats.c                     |    4 ++--
 libtinymail/tny-folder-store-change.c              |    8 ++++----
 libtinymail/tny-folder-store-observer.c            |    4 ++--
 libtinymail/tny-folder-store-query.c               |   12 ++++++------
 libtinymail/tny-folder-store.c                     |    4 ++--
 libtinymail/tny-folder.c                           |   16 ++++++++--------
 libtinymail/tny-fs-stream-cache.c                  |    4 ++--
 libtinymail/tny-fs-stream.c                        |    4 ++--
 libtinymail/tny-header.c                           |   12 ++++++------
 libtinymail/tny-iterator.c                         |    4 ++--
 libtinymail/tny-list.c                             |    4 ++--
 libtinymail/tny-lockable.c                         |    4 ++--
 libtinymail/tny-merge-folder-store.c               |    4 ++--
 libtinymail/tny-merge-folder.c                     |    4 ++--
 libtinymail/tny-mime-part.c                        |    4 ++--
 libtinymail/tny-msg-receive-strategy.c             |    4 ++--
 libtinymail/tny-msg-remove-strategy.c              |    4 ++--
 libtinymail/tny-msg.c                              |    4 ++--
 libtinymail/tny-noop-lockable.c                    |    4 ++--
 libtinymail/tny-pair.c                             |    4 ++--
 libtinymail/tny-password-getter.c                  |    4 ++--
 libtinymail/tny-seekable.c                         |    4 ++--
 libtinymail/tny-send-queue.c                       |    8 ++++----
 libtinymail/tny-simple-list-iterator.c             |    4 ++--
 libtinymail/tny-simple-list.c                      |    4 ++--
 libtinymail/tny-status.c                           |    8 ++++----
 libtinymail/tny-store-account.c                    |    8 ++++----
 libtinymail/tny-stream-cache.c                     |    4 ++--
 libtinymail/tny-stream.c                           |    4 ++--
 libtinymail/tny-transport-account.c                |    4 ++--
 .../tny-gnome-keyring-password-getter.c            |    4 ++--
 .../tny-gtk-account-list-model-iterator.c          |    4 ++--
 libtinymailui-gtk/tny-gtk-account-list-model.c     |    8 ++++----
 .../tny-gtk-attach-list-model-iterator.c           |    4 ++--
 libtinymailui-gtk/tny-gtk-attach-list-model.c      |    8 ++++----
 .../tny-gtk-attachment-mime-part-view.c            |    4 ++--
 .../tny-gtk-expander-mime-part-view.c              |    4 ++--
 .../tny-gtk-folder-list-store-iterator.c           |    4 ++--
 libtinymailui-gtk/tny-gtk-folder-list-store.c      |    8 ++++----
 .../tny-gtk-folder-store-tree-model-iterator.c     |    4 ++--
 .../tny-gtk-folder-store-tree-model.c              |    8 ++++----
 libtinymailui-gtk/tny-gtk-header-list-iterator.c   |    4 ++--
 libtinymailui-gtk/tny-gtk-header-list-model.c      |    8 ++++----
 libtinymailui-gtk/tny-gtk-header-view.c            |    4 ++--
 libtinymailui-gtk/tny-gtk-image-mime-part-view.c   |    4 ++--
 libtinymailui-gtk/tny-gtk-lockable.c               |    4 ++--
 .../tny-gtk-mime-part-save-strategy.c              |    4 ++--
 libtinymailui-gtk/tny-gtk-msg-view.c               |    4 ++--
 libtinymailui-gtk/tny-gtk-msg-window.c             |    4 ++--
 libtinymailui-gtk/tny-gtk-password-dialog.c        |    4 ++--
 libtinymailui-gtk/tny-gtk-pixbuf-stream.c          |    4 ++--
 libtinymailui-gtk/tny-gtk-text-buffer-stream.c     |    4 ++--
 libtinymailui-gtk/tny-gtk-text-mime-part-view.c    |    4 ++--
 .../tny-gtk-html-mime-part-view.c                  |    4 ++--
 libtinymailui-gtkhtml/tny-gtk-html-msg-view.c      |    4 ++--
 libtinymailui-gtkhtml/tny-gtk-html-stream.c        |    4 ++--
 .../tny-moz-embed-html-mime-part-view.c            |    4 ++--
 libtinymailui-mozembed/tny-moz-embed-msg-view.c    |    4 ++--
 libtinymailui-mozembed/tny-moz-embed-stream.c      |    4 ++--
 .../tny-webkit-html-mime-part-view.c               |    4 ++--
 libtinymailui-webkit/tny-webkit-msg-view.c         |    4 ++--
 libtinymailui-webkit/tny-webkit-stream.c           |    4 ++--
 libtinymailui/tny-account-store-view.c             |    4 ++--
 libtinymailui/tny-header-view.c                    |    4 ++--
 libtinymailui/tny-mime-part-save-strategy.c        |    4 ++--
 libtinymailui/tny-mime-part-saver.c                |    4 ++--
 libtinymailui/tny-mime-part-view.c                 |    4 ++--
 libtinymailui/tny-msg-view.c                       |    4 ++--
 libtinymailui/tny-msg-window.c                     |    4 ++--
 libtinymailui/tny-platform-factory.c               |    4 ++--
 libtinymailui/tny-summary-view.c                   |    4 ++--
 132 files changed, 315 insertions(+), 310 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 52c4337..e261537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-04  Simon Schubert  <2 0x2c org>
+
+	Use GPOINTER_TO_SIZE (once.retval) to retrieve GType values.
+	This fixes crashes on 64-bit machines.
+
 2010-03-03  Jose Dapena Paz  <jdapena igalia com>
 
 	* Misc build fixes.
diff --git a/libtinymail-acap/tny-acap-account-store.c b/libtinymail-acap/tny-acap-account-store.c
index 4b107c2..a2f9c57 100644
--- a/libtinymail-acap/tny-acap-account-store.c
+++ b/libtinymail-acap/tny-acap-account-store.c
@@ -257,7 +257,7 @@ tny_acap_account_store_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ACCOUNT_STORE, 
 				     &tny_account_store_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -265,5 +265,5 @@ tny_acap_account_store_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_acap_account_store_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-account.c b/libtinymail-camel/tny-camel-account.c
index a076299..ed5ed9e 100644
--- a/libtinymail-camel/tny-camel-account.c
+++ b/libtinymail-camel/tny-camel-account.c
@@ -2377,7 +2377,7 @@ tny_camel_account_register_type (gpointer notused)
 				     &tny_account_info);
 	
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -2401,5 +2401,5 @@ tny_camel_account_get_type (void)
 	}
 
 	g_once (&once, tny_camel_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-bs-mime-part.c b/libtinymail-camel/tny-camel-bs-mime-part.c
index cca9863..273f01d 100644
--- a/libtinymail-camel/tny-camel-bs-mime-part.c
+++ b/libtinymail-camel/tny-camel-bs-mime-part.c
@@ -1327,7 +1327,7 @@ tny_camel_bs_mime_part_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART, 
 				     &tny_mime_part_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -1352,5 +1352,5 @@ tny_camel_bs_mime_part_get_type (void)
 	}
 
 	g_once (&once, tny_camel_bs_mime_part_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-bs-msg-header.c b/libtinymail-camel/tny-camel-bs-msg-header.c
index d8b8c3b..2879be7 100644
--- a/libtinymail-camel/tny-camel-bs-msg-header.c
+++ b/libtinymail-camel/tny-camel-bs-msg-header.c
@@ -345,7 +345,7 @@ tny_camel_bs_msg_header_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_HEADER, 
 				     &tny_header_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -370,5 +370,5 @@ tny_camel_bs_msg_header_get_type (void)
 	}
 
 	g_once (&once, tny_camel_bs_msg_header_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-bs-msg-receive-strategy.c b/libtinymail-camel/tny-camel-bs-msg-receive-strategy.c
index 75e4347..6901e2d 100644
--- a/libtinymail-camel/tny-camel-bs-msg-receive-strategy.c
+++ b/libtinymail-camel/tny-camel-bs-msg-receive-strategy.c
@@ -374,7 +374,7 @@ tny_camel_bs_msg_receive_strategy_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MSG_RECEIVE_STRATEGY,
 				     &tny_msg_receive_strategy_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -382,7 +382,7 @@ tny_camel_bs_msg_receive_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_bs_msg_receive_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 void
diff --git a/libtinymail-camel/tny-camel-bs-msg.c b/libtinymail-camel/tny-camel-bs-msg.c
index 75599dc..22a5276 100644
--- a/libtinymail-camel/tny-camel-bs-msg.c
+++ b/libtinymail-camel/tny-camel-bs-msg.c
@@ -397,7 +397,7 @@ tny_camel_bs_msg_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MSG,
 				     &tny_msg_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -422,5 +422,5 @@ tny_camel_bs_msg_get_type (void)
 	}
 
 	g_once (&once, tny_camel_bs_msg_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-default-connection-policy.c b/libtinymail-camel/tny-camel-default-connection-policy.c
index 43710eb..efa8c83 100644
--- a/libtinymail-camel/tny-camel-default-connection-policy.c
+++ b/libtinymail-camel/tny-camel-default-connection-policy.c
@@ -127,7 +127,7 @@ tny_camel_default_connection_policy_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_CONNECTION_POLICY,
 				     &tny_connection_policy_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -135,5 +135,5 @@ tny_camel_default_connection_policy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_default_connection_policy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-folder.c b/libtinymail-camel/tny-camel-folder.c
index 73924f0..22877e6 100644
--- a/libtinymail-camel/tny-camel-folder.c
+++ b/libtinymail-camel/tny-camel-folder.c
@@ -6857,7 +6857,7 @@ tny_camel_folder_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_FOLDER, 
 				     &tny_folder_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -6882,5 +6882,5 @@ tny_camel_folder_get_type (void)
 	}
 
 	g_once (&once, tny_camel_folder_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-full-msg-receive-strategy.c b/libtinymail-camel/tny-camel-full-msg-receive-strategy.c
index 13abdfe..a63a0bb 100644
--- a/libtinymail-camel/tny-camel-full-msg-receive-strategy.c
+++ b/libtinymail-camel/tny-camel-full-msg-receive-strategy.c
@@ -198,7 +198,7 @@ tny_camel_full_msg_receive_strategy_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MSG_RECEIVE_STRATEGY,
 				     &tny_msg_receive_strategy_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -206,5 +206,5 @@ tny_camel_full_msg_receive_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_full_msg_receive_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-header.c b/libtinymail-camel/tny-camel-header.c
index d62ea17..5e2ceeb 100644
--- a/libtinymail-camel/tny-camel-header.c
+++ b/libtinymail-camel/tny-camel-header.c
@@ -483,7 +483,7 @@ tny_camel_header_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_HEADER, 
 				     &tny_header_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -508,5 +508,5 @@ tny_camel_header_get_type (void)
 	}
 
 	g_once (&once, tny_camel_header_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-html-to-text-stream.c b/libtinymail-camel/tny-camel-html-to-text-stream.c
index a9a7714..c247931 100644
--- a/libtinymail-camel/tny-camel-html-to-text-stream.c
+++ b/libtinymail-camel/tny-camel-html-to-text-stream.c
@@ -105,7 +105,7 @@ tny_camel_html_to_text_stream_register_type (gpointer notused)
 				       "TnyCamelHtmlToTextStream",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -113,5 +113,5 @@ tny_camel_html_to_text_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_html_to_text_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-imap-folder.c b/libtinymail-camel/tny-camel-imap-folder.c
index 349a6ae..d35ca19 100644
--- a/libtinymail-camel/tny-camel-imap-folder.c
+++ b/libtinymail-camel/tny-camel-imap-folder.c
@@ -126,7 +126,7 @@ tny_camel_imap_folder_register_type (gpointer notused)
 				       "TnyCamelIMAPFolder",
 				       &info, 0);	    
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -151,5 +151,5 @@ tny_camel_imap_folder_get_type (void)
 	}
        
 	g_once (&once, tny_camel_imap_folder_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-imap-store-account.c b/libtinymail-camel/tny-camel-imap-store-account.c
index 9de03e9..04db60d 100644
--- a/libtinymail-camel/tny-camel-imap-store-account.c
+++ b/libtinymail-camel/tny-camel-imap-store-account.c
@@ -175,7 +175,7 @@ tny_camel_imap_store_account_register_type (gpointer notused)
 				       "TnyCamelIMAPStoreAccount",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -200,5 +200,5 @@ tny_camel_imap_store_account_get_type (void)
 	}
 
 	g_once (&once, tny_camel_imap_store_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-mem-stream.c b/libtinymail-camel/tny-camel-mem-stream.c
index f971370..912953f 100644
--- a/libtinymail-camel/tny-camel-mem-stream.c
+++ b/libtinymail-camel/tny-camel-mem-stream.c
@@ -115,7 +115,7 @@ tny_camel_mem_stream_register_type (gpointer notused)
 				       "TnyCamelMemStream",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -123,5 +123,5 @@ tny_camel_mem_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_mem_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-mime-part.c b/libtinymail-camel/tny-camel-mime-part.c
index a540b9e..2375a3a 100644
--- a/libtinymail-camel/tny-camel-mime-part.c
+++ b/libtinymail-camel/tny-camel-mime-part.c
@@ -1471,7 +1471,7 @@ tny_camel_mime_part_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART, 
 				     &tny_mime_part_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -1496,5 +1496,5 @@ tny_camel_mime_part_get_type (void)
 	}
 
 	g_once (&once, tny_camel_mime_part_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-msg-header.c b/libtinymail-camel/tny-camel-msg-header.c
index 608d250..eb40a51 100644
--- a/libtinymail-camel/tny-camel-msg-header.c
+++ b/libtinymail-camel/tny-camel-msg-header.c
@@ -668,7 +668,7 @@ tny_camel_msg_header_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_HEADER, 
 				     &tny_header_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -693,5 +693,5 @@ tny_camel_msg_header_get_type (void)
 	}
 
 	g_once (&once, tny_camel_msg_header_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-msg-remove-strategy.c b/libtinymail-camel/tny-camel-msg-remove-strategy.c
index 7998b47..c1ae5df 100644
--- a/libtinymail-camel/tny-camel-msg-remove-strategy.c
+++ b/libtinymail-camel/tny-camel-msg-remove-strategy.c
@@ -180,7 +180,7 @@ tny_camel_msg_remove_strategy_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MSG_REMOVE_STRATEGY, 
 				     &tny_camel_msg_remove_strategy_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -188,5 +188,5 @@ tny_camel_msg_remove_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_msg_remove_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-msg.c b/libtinymail-camel/tny-camel-msg.c
index 889929d..192f47b 100644
--- a/libtinymail-camel/tny-camel-msg.c
+++ b/libtinymail-camel/tny-camel-msg.c
@@ -483,7 +483,7 @@ tny_camel_msg_register_type (gpointer notused)
 				     &tny_msg_info);
 	
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -508,7 +508,7 @@ tny_camel_msg_get_type (void)
 	}
 
 	g_once (&once, tny_camel_msg_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 void
diff --git a/libtinymail-camel/tny-camel-nntp-folder.c b/libtinymail-camel/tny-camel-nntp-folder.c
index 5cad4fc..1913eda 100644
--- a/libtinymail-camel/tny-camel-nntp-folder.c
+++ b/libtinymail-camel/tny-camel-nntp-folder.c
@@ -143,7 +143,7 @@ tny_camel_nntp_folder_register_type (gpointer notused)
 				       "TnyCamelNNTPFolder",
 				       &info, 0);	    
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -168,6 +168,6 @@ tny_camel_nntp_folder_get_type (void)
 	}
        
 	g_once (&once, tny_camel_nntp_folder_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 
 }
diff --git a/libtinymail-camel/tny-camel-nntp-store-account.c b/libtinymail-camel/tny-camel-nntp-store-account.c
index 9663e44..878ead2 100644
--- a/libtinymail-camel/tny-camel-nntp-store-account.c
+++ b/libtinymail-camel/tny-camel-nntp-store-account.c
@@ -195,7 +195,7 @@ tny_camel_nntp_store_account_register_type (gpointer notused)
 				       "TnyCamelNNTPStoreAccount",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -220,5 +220,5 @@ tny_camel_nntp_store_account_get_type (void)
 	}
 
 	g_once (&once, tny_camel_nntp_store_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-partial-msg-receive-strategy.c b/libtinymail-camel/tny-camel-partial-msg-receive-strategy.c
index f2e0a45..838223e 100644
--- a/libtinymail-camel/tny-camel-partial-msg-receive-strategy.c
+++ b/libtinymail-camel/tny-camel-partial-msg-receive-strategy.c
@@ -196,7 +196,7 @@ tny_camel_partial_msg_receive_strategy_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MSG_RECEIVE_STRATEGY,
 				     &tny_msg_receive_strategy_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -204,5 +204,5 @@ tny_camel_partial_msg_receive_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_partial_msg_receive_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-pop-folder.c b/libtinymail-camel/tny-camel-pop-folder.c
index a1fe891..e99c21a 100644
--- a/libtinymail-camel/tny-camel-pop-folder.c
+++ b/libtinymail-camel/tny-camel-pop-folder.c
@@ -144,7 +144,7 @@ tny_camel_pop_folder_register_type (gpointer notused)
 				       "TnyCamelPOPFolder",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -169,5 +169,5 @@ tny_camel_pop_folder_get_type (void)
 	}
 
 	g_once (&once, tny_camel_pop_folder_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-pop-remote-msg-remove-strategy.c b/libtinymail-camel/tny-camel-pop-remote-msg-remove-strategy.c
index 1bd5052..b0631f8 100644
--- a/libtinymail-camel/tny-camel-pop-remote-msg-remove-strategy.c
+++ b/libtinymail-camel/tny-camel-pop-remote-msg-remove-strategy.c
@@ -205,7 +205,7 @@ tny_camel_pop_remote_msg_remove_strategy_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MSG_REMOVE_STRATEGY, 
 				     &tny_camel_pop_remote_msg_remove_strategy_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -213,5 +213,5 @@ tny_camel_pop_remote_msg_remove_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_pop_remote_msg_remove_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-pop-store-account.c b/libtinymail-camel/tny-camel-pop-store-account.c
index 46c30f6..8e46486 100644
--- a/libtinymail-camel/tny-camel-pop-store-account.c
+++ b/libtinymail-camel/tny-camel-pop-store-account.c
@@ -275,7 +275,7 @@ tny_camel_pop_store_account_register_type (gpointer notused)
 				       "TnyCamelPOPStoreAccount",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -300,5 +300,5 @@ tny_camel_pop_store_account_get_type (void)
 	}
 
 	g_once (&once, tny_camel_pop_store_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-queue.c b/libtinymail-camel/tny-camel-queue.c
index 3b5413a..e61e166 100644
--- a/libtinymail-camel/tny-camel-queue.c
+++ b/libtinymail-camel/tny-camel-queue.c
@@ -587,7 +587,7 @@ tny_camel_queue_register_type (gpointer notused)
 				       "TnyCamelQueue",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -602,5 +602,5 @@ tny_camel_queue_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_queue_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-recover-connection-policy.c b/libtinymail-camel/tny-camel-recover-connection-policy.c
index f773000..b3696c0 100644
--- a/libtinymail-camel/tny-camel-recover-connection-policy.c
+++ b/libtinymail-camel/tny-camel-recover-connection-policy.c
@@ -214,7 +214,7 @@ tny_camel_recover_connection_policy_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_CONNECTION_POLICY,
 				     &tny_connection_policy_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -222,5 +222,5 @@ tny_camel_recover_connection_policy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_camel_recover_connection_policy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-send-queue.c b/libtinymail-camel/tny-camel-send-queue.c
index 182805e..ad38799 100644
--- a/libtinymail-camel/tny-camel-send-queue.c
+++ b/libtinymail-camel/tny-camel-send-queue.c
@@ -1624,7 +1624,7 @@ tny_camel_send_queue_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_SEND_QUEUE,
 				     &tny_send_queue_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -1648,5 +1648,5 @@ tny_camel_send_queue_get_type (void)
 	}
 
 	g_once (&once, tny_camel_send_queue_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return (GType) (gulong) (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-store-account.c b/libtinymail-camel/tny-camel-store-account.c
index 4db0fec..83bb8ab 100644
--- a/libtinymail-camel/tny-camel-store-account.c
+++ b/libtinymail-camel/tny-camel-store-account.c
@@ -2498,7 +2498,7 @@ tny_camel_store_account_register_type (gpointer notused)
 				     &tny_store_account_info);
 	
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -2523,5 +2523,5 @@ tny_camel_store_account_get_type (void)
 	}
 
 	g_once (&once, tny_camel_store_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-stream.c b/libtinymail-camel/tny-camel-stream.c
index 0d8c074..3351bee 100644
--- a/libtinymail-camel/tny-camel-stream.c
+++ b/libtinymail-camel/tny-camel-stream.c
@@ -312,7 +312,7 @@ tny_camel_stream_register_type (gpointer notused)
 				     &tny_seekable_info);
 	
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -337,5 +337,5 @@ tny_camel_stream_get_type (void)
 	}
 
 	g_once (&once, tny_camel_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-camel/tny-camel-transport-account.c b/libtinymail-camel/tny-camel-transport-account.c
index e2ccbb5..e28295e 100644
--- a/libtinymail-camel/tny-camel-transport-account.c
+++ b/libtinymail-camel/tny-camel-transport-account.c
@@ -408,7 +408,7 @@ tny_camel_transport_account_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_TRANSPORT_ACCOUNT, 
 				     &tny_transport_account_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -433,5 +433,5 @@ tny_camel_transport_account_get_type (void)
 	}
 
 	g_once (&once, tny_camel_transport_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gio/tny-gio-input-stream.c b/libtinymail-gio/tny-gio-input-stream.c
index a5458b8..e781366 100644
--- a/libtinymail-gio/tny-gio-input-stream.c
+++ b/libtinymail-gio/tny-gio-input-stream.c
@@ -369,7 +369,7 @@ tny_gio_input_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_SEEKABLE,
 				     &tny_seekable_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -377,5 +377,5 @@ tny_gio_input_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gio_input_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gio/tny-gio-output-stream.c b/libtinymail-gio/tny-gio-output-stream.c
index e52cc76..e6dd102 100644
--- a/libtinymail-gio/tny-gio-output-stream.c
+++ b/libtinymail-gio/tny-gio-output-stream.c
@@ -394,7 +394,7 @@ tny_gio_output_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_SEEKABLE,
 				     &tny_seekable_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -402,5 +402,5 @@ tny_gio_output_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gio_output_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gnome-desktop/tny-gnome-account-store.c b/libtinymail-gnome-desktop/tny-gnome-account-store.c
index 0f15de2..4800c09 100644
--- a/libtinymail-gnome-desktop/tny-gnome-account-store.c
+++ b/libtinymail-gnome-desktop/tny-gnome-account-store.c
@@ -588,7 +588,7 @@ tny_gnome_account_store_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ACCOUNT_STORE, 
 				     &tny_account_store_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -603,5 +603,5 @@ tny_gnome_account_store_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gnome_account_store_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gnome-desktop/tny-gnome-device.c b/libtinymail-gnome-desktop/tny-gnome-device.c
index f995b4d..3e6f4bf 100644
--- a/libtinymail-gnome-desktop/tny-gnome-device.c
+++ b/libtinymail-gnome-desktop/tny-gnome-device.c
@@ -340,7 +340,7 @@ tny_gnome_device_register_type (gpointer notused)
 				     &tny_device_info);
 	
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -348,5 +348,5 @@ tny_gnome_device_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gnome_device_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gnome-desktop/tny-gnome-platform-factory.c b/libtinymail-gnome-desktop/tny-gnome-platform-factory.c
index b1e3eb4..ab89035 100644
--- a/libtinymail-gnome-desktop/tny-gnome-platform-factory.c
+++ b/libtinymail-gnome-desktop/tny-gnome-platform-factory.c
@@ -224,7 +224,7 @@ tny_gnome_platform_factory_register_type (gpointer notused)
 				     &tny_platform_factory_info);
 
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -232,5 +232,5 @@ tny_gnome_platform_factory_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gnome_platform_factory_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gnomevfs/tny-vfs-stream.c b/libtinymail-gnomevfs/tny-vfs-stream.c
index 5c75b36..4709d64 100644
--- a/libtinymail-gnomevfs/tny-vfs-stream.c
+++ b/libtinymail-gnomevfs/tny-vfs-stream.c
@@ -508,7 +508,7 @@ tny_vfs_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_SEEKABLE, 
 				     &tny_seekable_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -516,5 +516,5 @@ tny_vfs_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_vfs_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gpe/tny-gpe-account-store.c b/libtinymail-gpe/tny-gpe-account-store.c
index 888d212..78e9caa 100644
--- a/libtinymail-gpe/tny-gpe-account-store.c
+++ b/libtinymail-gpe/tny-gpe-account-store.c
@@ -585,7 +585,7 @@ tny_gpe_account_store_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ACCOUNT_STORE, 
 				     &tny_account_store_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -593,5 +593,5 @@ tny_gpe_account_store_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gpe_account_store_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gpe/tny-gpe-device.c b/libtinymail-gpe/tny-gpe-device.c
index d1d4b27..560b795 100644
--- a/libtinymail-gpe/tny-gpe-device.c
+++ b/libtinymail-gpe/tny-gpe-device.c
@@ -243,7 +243,7 @@ tny_gpe_device_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_DEVICE, 
 				     &tny_device_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -251,5 +251,5 @@ tny_gpe_device_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gpe_device_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-gpe/tny-gpe-platform-factory.c b/libtinymail-gpe/tny-gpe-platform-factory.c
index 1dd1ceb..f52d3ad 100644
--- a/libtinymail-gpe/tny-gpe-platform-factory.c
+++ b/libtinymail-gpe/tny-gpe-platform-factory.c
@@ -190,7 +190,7 @@ tny_gpe_platform_factory_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_PLATFORM_FACTORY, 
 				     &tny_platform_factory_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -198,5 +198,5 @@ tny_gpe_platform_factory_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gpe_platform_factory_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-maemo/tny-maemo-account-store.c b/libtinymail-maemo/tny-maemo-account-store.c
index 08647e4..1db67ce 100644
--- a/libtinymail-maemo/tny-maemo-account-store.c
+++ b/libtinymail-maemo/tny-maemo-account-store.c
@@ -592,7 +592,7 @@ tny_maemo_account_store_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ACCOUNT_STORE, 
 				     &tny_account_store_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -600,5 +600,5 @@ tny_maemo_account_store_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_maemo_account_store_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-maemo/tny-maemo-conic-device.c b/libtinymail-maemo/tny-maemo-conic-device.c
index 28610f0..55606b7 100644
--- a/libtinymail-maemo/tny-maemo-conic-device.c
+++ b/libtinymail-maemo/tny-maemo-conic-device.c
@@ -815,7 +815,7 @@ tny_maemo_conic_device_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_DEVICE, 
 				     &tny_device_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -823,7 +823,7 @@ tny_maemo_conic_device_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_maemo_conic_device_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 static void 
 stop_loop (TnyMaemoConicDevice *self)
diff --git a/libtinymail-maemo/tny-maemo-conic-dummy-device.c b/libtinymail-maemo/tny-maemo-conic-dummy-device.c
index d3dfd51..1cf6937 100644
--- a/libtinymail-maemo/tny-maemo-conic-dummy-device.c
+++ b/libtinymail-maemo/tny-maemo-conic-dummy-device.c
@@ -675,7 +675,7 @@ tny_maemo_conic_device_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_DEVICE, 
 				     &tny_device_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -683,7 +683,7 @@ tny_maemo_conic_device_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_maemo_conic_device_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gboolean 
diff --git a/libtinymail-maemo/tny-maemo-device.c b/libtinymail-maemo/tny-maemo-device.c
index cfdd154..34d2b25 100644
--- a/libtinymail-maemo/tny-maemo-device.c
+++ b/libtinymail-maemo/tny-maemo-device.c
@@ -241,7 +241,7 @@ tny_maemo_device_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_DEVICE, 
 				     &tny_device_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -249,5 +249,5 @@ tny_maemo_device_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_maemo_device_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-maemo/tny-maemo-noconic-device.c b/libtinymail-maemo/tny-maemo-noconic-device.c
index 24c9c3a..df6656a 100644
--- a/libtinymail-maemo/tny-maemo-noconic-device.c
+++ b/libtinymail-maemo/tny-maemo-noconic-device.c
@@ -197,7 +197,7 @@ tny_maemo_conic_device_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_DEVICE, 
 				     &tny_device_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -205,7 +205,7 @@ tny_maemo_conic_device_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_maemo_conic_device_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 gboolean
diff --git a/libtinymail-maemo/tny-maemo-platform-factory.c b/libtinymail-maemo/tny-maemo-platform-factory.c
index e2303fb..a6543c4 100644
--- a/libtinymail-maemo/tny-maemo-platform-factory.c
+++ b/libtinymail-maemo/tny-maemo-platform-factory.c
@@ -189,7 +189,7 @@ tny_maemo_platform_factory_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_PLATFORM_FACTORY, 
 				     &tny_platform_factory_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -197,5 +197,5 @@ tny_maemo_platform_factory_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_maemo_platform_factory_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-moblin/tny-moblin-account-store.c b/libtinymail-moblin/tny-moblin-account-store.c
index 48b359c..544a133 100644
--- a/libtinymail-moblin/tny-moblin-account-store.c
+++ b/libtinymail-moblin/tny-moblin-account-store.c
@@ -588,7 +588,7 @@ tny_moblin_account_store_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ACCOUNT_STORE,
 				     &tny_account_store_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -603,5 +603,5 @@ tny_moblin_account_store_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_moblin_account_store_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-moblin/tny-moblin-device.c b/libtinymail-moblin/tny-moblin-device.c
index 318ca99..d022c17 100644
--- a/libtinymail-moblin/tny-moblin-device.c
+++ b/libtinymail-moblin/tny-moblin-device.c
@@ -395,7 +395,7 @@ tny_moblin_device_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_DEVICE, 
 				     &tny_device_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -403,5 +403,5 @@ tny_moblin_device_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_moblin_device_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-moblin/tny-moblin-platform-factory.c b/libtinymail-moblin/tny-moblin-platform-factory.c
index aec46df..bce78ec 100644
--- a/libtinymail-moblin/tny-moblin-platform-factory.c
+++ b/libtinymail-moblin/tny-moblin-platform-factory.c
@@ -196,7 +196,7 @@ tny_moblin_platform_factory_register_type (gpointer notused)
 				     &tny_platform_factory_info);
 
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -204,5 +204,5 @@ tny_moblin_platform_factory_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_moblin_platform_factory_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail-tp/tny-tp-mail-notifier.c b/libtinymail-tp/tny-tp-mail-notifier.c
index e0e330d..e09b6cd 100644
--- a/libtinymail-tp/tny-tp-mail-notifier.c
+++ b/libtinymail-tp/tny-tp-mail-notifier.c
@@ -112,7 +112,7 @@ tny_tp_mail_notifier_register_type (gpointer notused)
 	object_type = g_type_register_static (G_TYPE_OBJECT, 
 					      "TnyTpMailNotifier", &object_info, 0);
 
-	return GUINT_TO_POINTER (object_type);
+	return GSIZE_TO_POINTER (object_type);
 }
 
 GType
@@ -120,5 +120,5 @@ tny_tp_mail_notifier_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_tp_mail_notifier_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-account-store.c b/libtinymail/tny-account-store.c
index dcaf971..f9545c9 100644
--- a/libtinymail/tny-account-store.c
+++ b/libtinymail/tny-account-store.c
@@ -405,7 +405,7 @@ tny_account_store_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -423,7 +423,7 @@ tny_account_store_get_type (void)
 
 	g_once (&once, tny_account_store_register_type, NULL);
 
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -439,7 +439,7 @@ tny_alert_type_register_type (gpointer notused)
 
   etype = g_enum_register_static ("TnyAlertType", values);
 
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -457,7 +457,7 @@ tny_alert_type_get_type (void)
   
   g_once (&once, tny_alert_type_register_type, NULL);
 
-  return GPOINTER_TO_UINT (once.retval);;
+  return GPOINTER_TO_SIZE (once.retval);;
 }
 
 static gpointer
@@ -472,7 +472,7 @@ tny_get_accounts_request_type_register_type (gpointer notused)
   };
 
   etype = g_enum_register_static ("TnyGetAccountsRequestType", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -488,7 +488,7 @@ tny_get_accounts_request_type_get_type (void)
 {
   static GOnce once = G_ONCE_INIT;
   g_once (&once, tny_get_accounts_request_type_register_type, NULL);
-  return GPOINTER_TO_UINT (once.retval);
+  return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -501,7 +501,7 @@ tny_account_store_signal_register_type (gpointer notused)
     { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyAccountStoreSignal", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -519,5 +519,5 @@ tny_account_store_signal_get_type (void)
 
   g_once (&once, tny_account_store_signal_register_type, NULL);
 
-  return GPOINTER_TO_UINT (once.retval);
+  return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-account.c b/libtinymail/tny-account.c
index a435dbe..8147a45 100644
--- a/libtinymail/tny-account.c
+++ b/libtinymail/tny-account.c
@@ -1111,7 +1111,7 @@ tny_account_register_type (gpointer notused)
 				       "TnyAccount", &info, 0);
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -1127,7 +1127,7 @@ tny_account_get_type (void)
 	static GOnce once = G_ONCE_INIT;
 
 	g_once (&once, tny_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1140,7 +1140,7 @@ tny_account_type_register_type (gpointer notused)
 	  { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyAccountType", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1157,7 +1157,7 @@ tny_account_type_get_type (void)
 
 	g_once (&once, tny_account_type_register_type, NULL);
 
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1171,7 +1171,7 @@ tny_account_signal_type_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_enum_register_static ("TnyAccountSignal", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1188,7 +1188,7 @@ tny_account_signal_type_get_type (void)
 
 	g_once (&once, tny_account_signal_type_register_type, NULL);
 	
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1205,7 +1205,7 @@ tny_connection_status_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_enum_register_static ("TnyConnectionStatus", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1222,7 +1222,7 @@ tny_connection_status_get_type (void)
 
 	g_once (&once, tny_connection_status_register_type, NULL);
 
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 
diff --git a/libtinymail/tny-cached-file-stream.c b/libtinymail/tny-cached-file-stream.c
index 0041cfa..5476d87 100644
--- a/libtinymail/tny-cached-file-stream.c
+++ b/libtinymail/tny-cached-file-stream.c
@@ -284,7 +284,7 @@ tny_cached_file_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_SEEKABLE, 
 				     &tny_seekable_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -292,5 +292,5 @@ tny_cached_file_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_cached_file_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-cached-file.c b/libtinymail/tny-cached-file.c
index bd29cc0..6481cb8 100644
--- a/libtinymail/tny-cached-file.c
+++ b/libtinymail/tny-cached-file.c
@@ -553,7 +553,7 @@ tny_cached_file_register_type (gpointer notused)
 				       "TnyCachedFile",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -561,5 +561,5 @@ tny_cached_file_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_cached_file_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-combined-account.c b/libtinymail/tny-combined-account.c
index 139ec4a..6483f76 100644
--- a/libtinymail/tny-combined-account.c
+++ b/libtinymail/tny-combined-account.c
@@ -625,7 +625,7 @@ tny_combined_account_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_TRANSPORT_ACCOUNT,
 				     &tny_transport_account_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -635,5 +635,5 @@ tny_combined_account_get_type (void)
 
 	g_once (&once, tny_combined_account_register_type, NULL);
 
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-connection-policy.c b/libtinymail/tny-connection-policy.c
index fea1b4c..e1d917d 100644
--- a/libtinymail/tny-connection-policy.c
+++ b/libtinymail/tny-connection-policy.c
@@ -175,7 +175,7 @@ tny_connection_policy_register_type (gpointer notused)
 		};
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyConnectionPolicy", &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -185,5 +185,5 @@ tny_connection_policy_get_type (void)
 
 	g_once (&once, tny_connection_policy_register_type, NULL);
 
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-device.c b/libtinymail/tny-device.c
index 4de1cf0..d7b9a5e 100644
--- a/libtinymail/tny-device.c
+++ b/libtinymail/tny-device.c
@@ -246,7 +246,7 @@ tny_device_register_type (gpointer notused)
 	
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -256,7 +256,7 @@ tny_device_get_type (void)
 
 	g_once (&once, tny_device_register_type, NULL);
 
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 
@@ -270,7 +270,7 @@ tny_device_signal_register_type (gpointer notused)
     { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyDeviceSignal", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -285,7 +285,7 @@ tny_device_signal_get_type (void)
 {
   static GOnce once = G_ONCE_INIT;
   g_once (&once, tny_device_signal_register_type, NULL);
-  return GPOINTER_TO_UINT (once.retval);
+  return GPOINTER_TO_SIZE (once.retval);
 }
 
 /**
diff --git a/libtinymail/tny-expunged-header.c b/libtinymail/tny-expunged-header.c
index 16d4e99..fb8568e 100644
--- a/libtinymail/tny-expunged-header.c
+++ b/libtinymail/tny-expunged-header.c
@@ -257,7 +257,7 @@ tny_expunged_header_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_HEADER,
 				     &tny_header_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -265,5 +265,5 @@ tny_expunged_header_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_expunged_header_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder-change.c b/libtinymail/tny-folder-change.c
index 981d4e7..8c39268 100644
--- a/libtinymail/tny-folder-change.c
+++ b/libtinymail/tny-folder-change.c
@@ -615,7 +615,7 @@ tny_folder_change_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_OBJECT,
 				       "TnyFolderChange",
 				       &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -623,7 +623,7 @@ tny_folder_change_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_change_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -640,7 +640,7 @@ tny_folder_change_changed_register_type (gpointer notused)
 	  { 0, NULL, NULL }
   };
   etype = g_flags_register_static ("TnyFolderChangeChanged", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -655,5 +655,5 @@ tny_folder_change_changed_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_change_changed_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder-monitor.c b/libtinymail/tny-folder-monitor.c
index 1cc7364..41d1726 100644
--- a/libtinymail/tny-folder-monitor.c
+++ b/libtinymail/tny-folder-monitor.c
@@ -449,7 +449,7 @@ tny_folder_monitor_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_FOLDER_OBSERVER,
 				     &tny_folder_observer_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -457,5 +457,5 @@ tny_folder_monitor_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_monitor_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder-observer.c b/libtinymail/tny-folder-observer.c
index 86b8c70..1f39d27 100644
--- a/libtinymail/tny-folder-observer.c
+++ b/libtinymail/tny-folder-observer.c
@@ -92,7 +92,7 @@ tny_folder_observer_register_type (gpointer notused)
 		};
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyFolderObserver", &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -100,5 +100,5 @@ tny_folder_observer_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_observer_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder-stats.c b/libtinymail/tny-folder-stats.c
index d10edc1..f7eec48 100644
--- a/libtinymail/tny-folder-stats.c
+++ b/libtinymail/tny-folder-stats.c
@@ -227,7 +227,7 @@ tny_folder_stats_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_OBJECT,
 				       "TnyFolderStats",
 				       &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -235,5 +235,5 @@ tny_folder_stats_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_stats_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder-store-change.c b/libtinymail/tny-folder-store-change.c
index 3ac9bb1..02542dc 100644
--- a/libtinymail/tny-folder-store-change.c
+++ b/libtinymail/tny-folder-store-change.c
@@ -372,7 +372,7 @@ tny_folder_store_change_register_type (gpointer notused)
   type = g_type_register_static (G_TYPE_OBJECT,
 				 "TnyFolderStoreChange",
 				 &info, 0);
-  return GUINT_TO_POINTER (type);
+  return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -387,7 +387,7 @@ tny_folder_store_change_get_type (void)
 {
   static GOnce once = G_ONCE_INIT;
   g_once (&once, tny_folder_store_change_register_type, NULL);
-  return GPOINTER_TO_UINT (once.retval);
+  return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -400,7 +400,7 @@ tny_folder_store_change_changed_register_type (gpointer notused)
     { 0, NULL, NULL }
   };
   etype = g_flags_register_static ("TnyFolderStoreChangeChanged", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -415,5 +415,5 @@ tny_folder_store_change_changed_get_type (void)
 {
   static GOnce once = G_ONCE_INIT;
   g_once (&once, tny_folder_store_change_changed_register_type, NULL);
-  return GPOINTER_TO_UINT (once.retval);
+  return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder-store-observer.c b/libtinymail/tny-folder-store-observer.c
index 7fdba9b..99cb07d 100644
--- a/libtinymail/tny-folder-store-observer.c
+++ b/libtinymail/tny-folder-store-observer.c
@@ -91,7 +91,7 @@ tny_folder_store_observer_register_type (gpointer notused)
 		};
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyFolderStoreObserver", &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -99,5 +99,5 @@ tny_folder_store_observer_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_store_observer_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder-store-query.c b/libtinymail/tny-folder-store-query.c
index c177c4d..e9536c9 100644
--- a/libtinymail/tny-folder-store-query.c
+++ b/libtinymail/tny-folder-store-query.c
@@ -139,7 +139,7 @@ tny_folder_store_query_register_type (gpointer notused)
 	object_type = g_type_register_static (G_TYPE_OBJECT, 
 					      "TnyFolderStoreQuery", &object_info, 0);
 
-	return GUINT_TO_POINTER (object_type);
+	return GSIZE_TO_POINTER (object_type);
 }
 
 GType
@@ -147,7 +147,7 @@ tny_folder_store_query_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_store_query_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -171,7 +171,7 @@ tny_folder_store_query_item_register_type (gpointer notused)
 	object_type = g_type_register_static (G_TYPE_OBJECT, 
 					      "TnyFolderStoreQueryItem", &object_info, 0);
 	
-	return GUINT_TO_POINTER (object_type);
+	return GSIZE_TO_POINTER (object_type);
 }
 
 /**
@@ -186,7 +186,7 @@ tny_folder_store_query_item_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_store_query_item_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gchar*
@@ -389,7 +389,7 @@ tny_folder_store_query_option_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_flags_register_static ("TnyFolderStoreQueryOption", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -404,5 +404,5 @@ tny_folder_store_query_option_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_store_query_option_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder-store.c b/libtinymail/tny-folder-store.c
index 942ea66..db45be0 100644
--- a/libtinymail/tny-folder-store.c
+++ b/libtinymail/tny-folder-store.c
@@ -471,7 +471,7 @@ tny_folder_store_register_type (gpointer notused)
 		};
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyFolderStore", &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -479,5 +479,5 @@ tny_folder_store_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_store_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-folder.c b/libtinymail/tny-folder.c
index 9ae2143..8e5fc4c 100644
--- a/libtinymail/tny-folder.c
+++ b/libtinymail/tny-folder.c
@@ -1607,7 +1607,7 @@ tny_folder_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -1615,7 +1615,7 @@ tny_folder_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1640,7 +1640,7 @@ tny_folder_type_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_enum_register_static ("TnyFolderType", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1655,7 +1655,7 @@ tny_folder_type_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_type_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1668,7 +1668,7 @@ tny_folder_caps_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_flags_register_static ("TnyFolderCaps", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1683,7 +1683,7 @@ tny_folder_caps_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_caps_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1697,7 +1697,7 @@ tny_folder_signal_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_enum_register_static ("TnyFolderSignal", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1712,5 +1712,5 @@ tny_folder_signal_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_folder_signal_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-fs-stream-cache.c b/libtinymail/tny-fs-stream-cache.c
index 475c803..7399087 100644
--- a/libtinymail/tny-fs-stream-cache.c
+++ b/libtinymail/tny-fs-stream-cache.c
@@ -441,7 +441,7 @@ tny_fs_stream_cache_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_STREAM_CACHE, 
 				     &tny_stream_cache_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -449,5 +449,5 @@ tny_fs_stream_cache_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_fs_stream_cache_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-fs-stream.c b/libtinymail/tny-fs-stream.c
index b7d4923..c0c25ca 100644
--- a/libtinymail/tny-fs-stream.c
+++ b/libtinymail/tny-fs-stream.c
@@ -399,7 +399,7 @@ tny_fs_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_SEEKABLE, 
 				     &tny_seekable_info);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -407,5 +407,5 @@ tny_fs_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_fs_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-header.c b/libtinymail/tny-header.c
index 6dfda97..5b1cb0a 100644
--- a/libtinymail/tny-header.c
+++ b/libtinymail/tny-header.c
@@ -735,7 +735,7 @@ tny_header_register_type (gpointer notused)
 				       "TnyHeader", &info, 0);
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -743,7 +743,7 @@ tny_header_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_header_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -767,7 +767,7 @@ tny_header_flags_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_flags_register_static ("TnyHeaderFlags", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -782,7 +782,7 @@ tny_header_flags_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_header_flags_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -798,7 +798,7 @@ tny_header_support_flags_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_flags_register_static ("TnyHeaderSupportFlags", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -813,5 +813,5 @@ tny_header_support_flags_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_header_support_flags_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-iterator.c b/libtinymail/tny-iterator.c
index 08e99ab..8283703 100644
--- a/libtinymail/tny-iterator.c
+++ b/libtinymail/tny-iterator.c
@@ -258,7 +258,7 @@ tny_iterator_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyIterator", &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -266,5 +266,5 @@ tny_iterator_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_iterator_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-list.c b/libtinymail/tny-list.c
index ccd99b2..9e39a5e 100644
--- a/libtinymail/tny-list.c
+++ b/libtinymail/tny-list.c
@@ -455,7 +455,7 @@ tny_list_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyList", &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -463,5 +463,5 @@ tny_list_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_list_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-lockable.c b/libtinymail/tny-lockable.c
index 19e0fb0..47e124f 100644
--- a/libtinymail/tny-lockable.c
+++ b/libtinymail/tny-lockable.c
@@ -99,7 +99,7 @@ tny_lockable_register_type (gpointer notused)
 		};
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyLockable", &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -107,5 +107,5 @@ tny_lockable_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_lockable_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-merge-folder-store.c b/libtinymail/tny-merge-folder-store.c
index cb6e3b3..abfacf2 100644
--- a/libtinymail/tny-merge-folder-store.c
+++ b/libtinymail/tny-merge-folder-store.c
@@ -695,7 +695,7 @@ tny_merge_folder_store_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_FOLDER_STORE_OBSERVER,
 				     &tny_folder_store_observer_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -703,5 +703,5 @@ tny_merge_folder_store_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_merge_folder_store_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-merge-folder.c b/libtinymail/tny-merge-folder.c
index bc2e249..2734e39 100644
--- a/libtinymail/tny-merge-folder.c
+++ b/libtinymail/tny-merge-folder.c
@@ -2044,7 +2044,7 @@ tny_merge_folder_register_type (gpointer notused)
 	
 	g_type_add_interface_static (type, TNY_TYPE_FOLDER_OBSERVER,
 				     &tny_folder_observer_info);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -2052,5 +2052,5 @@ tny_merge_folder_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_merge_folder_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-mime-part.c b/libtinymail/tny-mime-part.c
index 93c1eea..383b13b 100644
--- a/libtinymail/tny-mime-part.c
+++ b/libtinymail/tny-mime-part.c
@@ -1009,7 +1009,7 @@ tny_mime_part_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE,
 				       "TnyMimePart", &info, 0);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -1017,5 +1017,5 @@ tny_mime_part_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_mime_part_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-msg-receive-strategy.c b/libtinymail/tny-msg-receive-strategy.c
index fdc9bc6..d4e01ee 100644
--- a/libtinymail/tny-msg-receive-strategy.c
+++ b/libtinymail/tny-msg-receive-strategy.c
@@ -103,7 +103,7 @@ tny_msg_receive_strategy_register_type (gpointer notused)
 		};
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyMsgReceiveStrategy", &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -111,5 +111,5 @@ tny_msg_receive_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_msg_receive_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-msg-remove-strategy.c b/libtinymail/tny-msg-remove-strategy.c
index 9476d85..7dde92e 100644
--- a/libtinymail/tny-msg-remove-strategy.c
+++ b/libtinymail/tny-msg-remove-strategy.c
@@ -114,7 +114,7 @@ tny_msg_remove_strategy_register_type (gpointer notused)
 		};
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyMsgRemoveStrategy", &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -122,5 +122,5 @@ tny_msg_remove_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_msg_remove_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-msg.c b/libtinymail/tny-msg.c
index 3ccd9e0..2891aee 100644
--- a/libtinymail/tny-msg.c
+++ b/libtinymail/tny-msg.c
@@ -293,7 +293,7 @@ tny_msg_register_type (gpointer notused)
 	g_type_interface_add_prerequisite (type, TNY_TYPE_MIME_PART); 
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -301,5 +301,5 @@ tny_msg_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_msg_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-noop-lockable.c b/libtinymail/tny-noop-lockable.c
index df8d828..9c19985 100644
--- a/libtinymail/tny-noop-lockable.c
+++ b/libtinymail/tny-noop-lockable.c
@@ -124,7 +124,7 @@ tny_noop_lockable_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_LOCKABLE,
 				     &tny_lockable_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -132,5 +132,5 @@ tny_noop_lockable_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_noop_lockable_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-pair.c b/libtinymail/tny-pair.c
index 7332c81..57c9ad8 100644
--- a/libtinymail/tny-pair.c
+++ b/libtinymail/tny-pair.c
@@ -206,7 +206,7 @@ tny_pair_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_OBJECT,
 				       "TnyPair",
 				       &info, 0);
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -214,5 +214,5 @@ tny_pair_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_pair_register_type, NULL);
-	return  GPOINTER_TO_UINT (once.retval);
+	return  GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-password-getter.c b/libtinymail/tny-password-getter.c
index a249c23..ab5eeb6 100644
--- a/libtinymail/tny-password-getter.c
+++ b/libtinymail/tny-password-getter.c
@@ -123,7 +123,7 @@ tny_password_getter_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE,
 				       "TnyPasswordGetter", &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -131,5 +131,5 @@ tny_password_getter_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_password_getter_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-seekable.c b/libtinymail/tny-seekable.c
index 129f797..8d081d9 100644
--- a/libtinymail/tny-seekable.c
+++ b/libtinymail/tny-seekable.c
@@ -137,7 +137,7 @@ tny_seekable_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnySeekable", &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -145,5 +145,5 @@ tny_seekable_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_seekable_register_type, NULL);
-	return  GPOINTER_TO_UINT (once.retval);
+	return  GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-send-queue.c b/libtinymail/tny-send-queue.c
index 7d7bb48..a7ef26c 100644
--- a/libtinymail/tny-send-queue.c
+++ b/libtinymail/tny-send-queue.c
@@ -300,7 +300,7 @@ tny_send_queue_register_type (gpointer notused)
 				       "TnySendQueue", &info, 0);
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -315,7 +315,7 @@ tny_send_queue_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_send_queue_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -330,7 +330,7 @@ tny_send_queue_signal_register_type (gpointer notused)
 		{ 0, NULL, NULL }
 	};
 	etype = g_enum_register_static ("TnySendQueueSignal", values);
-	return GUINT_TO_POINTER (etype);
+	return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -345,5 +345,5 @@ tny_send_queue_signal_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_send_queue_signal_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-simple-list-iterator.c b/libtinymail/tny-simple-list-iterator.c
index a1beb28..4386994 100644
--- a/libtinymail/tny-simple-list-iterator.c
+++ b/libtinymail/tny-simple-list-iterator.c
@@ -273,7 +273,7 @@ _tny_simple_list_iterator_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ITERATOR, 
 				     &tny_iterator_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -281,5 +281,5 @@ _tny_simple_list_iterator_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, _tny_simple_list_iterator_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-simple-list.c b/libtinymail/tny-simple-list.c
index 5599658..8e2a06f 100644
--- a/libtinymail/tny-simple-list.c
+++ b/libtinymail/tny-simple-list.c
@@ -249,7 +249,7 @@ tny_simple_list_register_type (gpointer notused)
 	g_type_add_interface_static (object_type, TNY_TYPE_LIST,
 				     &tny_list_info);
 
-	return GUINT_TO_POINTER (object_type);
+	return GSIZE_TO_POINTER (object_type);
 }
 
 GType
@@ -257,5 +257,5 @@ tny_simple_list_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_simple_list_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-status.c b/libtinymail/tny-status.c
index ed22c95..f003c75 100644
--- a/libtinymail/tny-status.c
+++ b/libtinymail/tny-status.c
@@ -301,7 +301,7 @@ tny_status_domain_register_type (gpointer notused)
     { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyStatusDomain", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -316,7 +316,7 @@ tny_status_domain_get_type (void)
 {
   static GOnce once = G_ONCE_INIT;
   g_once (&once, tny_status_domain_register_type, NULL);
-  return GPOINTER_TO_UINT (once.retval);
+  return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -334,7 +334,7 @@ tny_status_code_register_type (gpointer notused)
     { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyStatusCode", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -349,5 +349,5 @@ tny_status_code_get_type (void)
 {
   static GOnce once = G_ONCE_INIT;
   g_once (&once, tny_status_code_register_type, NULL);
-  return GPOINTER_TO_UINT (once.retval);
+  return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-store-account.c b/libtinymail/tny-store-account.c
index 93ea1b3..ccc39ce 100644
--- a/libtinymail/tny-store-account.c
+++ b/libtinymail/tny-store-account.c
@@ -213,7 +213,7 @@ tny_store_account_register_type (gpointer notused)
 	g_type_interface_add_prerequisite (type, TNY_TYPE_FOLDER_STORE);
 	g_type_interface_add_prerequisite (type, TNY_TYPE_ACCOUNT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -228,7 +228,7 @@ tny_store_account_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_store_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -241,7 +241,7 @@ tny_store_account_signal_register_type (gpointer notused)
     { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyStoreAccountSignal", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -256,5 +256,5 @@ tny_store_account_signal_get_type (void)
 {
   static GOnce once = G_ONCE_INIT;
   g_once (&once, tny_store_account_signal_register_type, NULL);
-  return GPOINTER_TO_UINT (once.retval);
+  return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-stream-cache.c b/libtinymail/tny-stream-cache.c
index d083d8b..4466125 100644
--- a/libtinymail/tny-stream-cache.c
+++ b/libtinymail/tny-stream-cache.c
@@ -160,7 +160,7 @@ tny_stream_cache_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyStreamCache", &info, 0);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -168,5 +168,5 @@ tny_stream_cache_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_stream_cache_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-stream.c b/libtinymail/tny-stream.c
index f2f431f..4a6943f 100644
--- a/libtinymail/tny-stream.c
+++ b/libtinymail/tny-stream.c
@@ -221,7 +221,7 @@ tny_stream_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyStream", &info, 0);
 	
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -229,5 +229,5 @@ tny_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymail/tny-transport-account.c b/libtinymail/tny-transport-account.c
index 7a46c50..0745d61 100644
--- a/libtinymail/tny-transport-account.c
+++ b/libtinymail/tny-transport-account.c
@@ -93,7 +93,7 @@ tny_transport_account_register_type (gpointer notused)
 	
 	g_type_interface_add_prerequisite (type, TNY_TYPE_ACCOUNT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -101,5 +101,5 @@ tny_transport_account_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_transport_account_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c b/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c
index a9d1be0..253befc 100644
--- a/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c
+++ b/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c
@@ -255,7 +255,7 @@ tny_gnome_keyring_password_getter_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_PASSWORD_GETTER,
 				     &tny_password_getter_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -263,5 +263,5 @@ tny_gnome_keyring_password_getter_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gnome_keyring_password_getter_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-account-list-model-iterator.c b/libtinymailui-gtk/tny-gtk-account-list-model-iterator.c
index 5b6e9f7..e6ef270 100644
--- a/libtinymailui-gtk/tny-gtk-account-list-model-iterator.c
+++ b/libtinymailui-gtk/tny-gtk-account-list-model-iterator.c
@@ -262,7 +262,7 @@ _tny_gtk_account_list_model_iterator_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ITERATOR, 
 				     &tny_iterator_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -270,5 +270,5 @@ _tny_gtk_account_list_model_iterator_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, _tny_gtk_account_list_model_iterator_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-account-list-model.c b/libtinymailui-gtk/tny-gtk-account-list-model.c
index bb17c44..90a18b0 100644
--- a/libtinymailui-gtk/tny-gtk-account-list-model.c
+++ b/libtinymailui-gtk/tny-gtk-account-list-model.c
@@ -307,7 +307,7 @@ tny_gtk_account_list_model_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_LIST,
 				     &tny_list_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -322,7 +322,7 @@ tny_gtk_account_list_model_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_account_list_model_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -336,7 +336,7 @@ tny_gtk_account_list_model_column_register_type (gpointer notused)
       { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyGtkAccountListModelColumn", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -351,5 +351,5 @@ tny_gtk_account_list_model_column_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_account_list_model_column_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-attach-list-model-iterator.c b/libtinymailui-gtk/tny-gtk-attach-list-model-iterator.c
index e5689df..1965372 100644
--- a/libtinymailui-gtk/tny-gtk-attach-list-model-iterator.c
+++ b/libtinymailui-gtk/tny-gtk-attach-list-model-iterator.c
@@ -263,7 +263,7 @@ _tny_gtk_attach_list_model_iterator_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ITERATOR, 
 				     &tny_iterator_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -271,5 +271,5 @@ _tny_gtk_attach_list_model_iterator_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, _tny_gtk_attach_list_model_iterator_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-attach-list-model.c b/libtinymailui-gtk/tny-gtk-attach-list-model.c
index 111e251..05fb93c 100644
--- a/libtinymailui-gtk/tny-gtk-attach-list-model.c
+++ b/libtinymailui-gtk/tny-gtk-attach-list-model.c
@@ -386,7 +386,7 @@ tny_gtk_attach_list_model_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_LIST,
 				     &tny_list_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -401,7 +401,7 @@ tny_gtk_attach_list_model_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_attach_list_model_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -416,7 +416,7 @@ tny_gtk_attach_list_model_column_register_type (gpointer notused)
       { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyGtkAttachListModelColumn", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -431,5 +431,5 @@ tny_gtk_attach_list_model_column_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_attach_list_model_column_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-attachment-mime-part-view.c b/libtinymailui-gtk/tny-gtk-attachment-mime-part-view.c
index e2b1b01..a322735 100644
--- a/libtinymailui-gtk/tny-gtk-attachment-mime-part-view.c
+++ b/libtinymailui-gtk/tny-gtk-attachment-mime-part-view.c
@@ -233,7 +233,7 @@ tny_gtk_attachment_mime_part_view_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
 				     &tny_mime_part_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -248,5 +248,5 @@ tny_gtk_attachment_mime_part_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_attachment_mime_part_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-expander-mime-part-view.c b/libtinymailui-gtk/tny-gtk-expander-mime-part-view.c
index 3f5d804..d47aa0e 100644
--- a/libtinymailui-gtk/tny-gtk-expander-mime-part-view.c
+++ b/libtinymailui-gtk/tny-gtk-expander-mime-part-view.c
@@ -257,7 +257,7 @@ tny_gtk_expander_mime_part_view_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
 				     &tny_mime_part_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -265,5 +265,5 @@ tny_gtk_expander_mime_part_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_expander_mime_part_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-folder-list-store-iterator.c b/libtinymailui-gtk/tny-gtk-folder-list-store-iterator.c
index 6c38eb3..715b444 100644
--- a/libtinymailui-gtk/tny-gtk-folder-list-store-iterator.c
+++ b/libtinymailui-gtk/tny-gtk-folder-list-store-iterator.c
@@ -262,7 +262,7 @@ _tny_gtk_folder_list_store_iterator_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ITERATOR, 
 				     &tny_iterator_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -270,5 +270,5 @@ _tny_gtk_folder_list_store_iterator_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, _tny_gtk_folder_list_store_iterator_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-folder-list-store.c b/libtinymailui-gtk/tny-gtk-folder-list-store.c
index 0aae845..43661fe 100644
--- a/libtinymailui-gtk/tny-gtk-folder-list-store.c
+++ b/libtinymailui-gtk/tny-gtk-folder-list-store.c
@@ -1842,7 +1842,7 @@ tny_gtk_folder_list_store_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_FOLDER_OBSERVER,
 				     &tny_folder_observer_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -1857,7 +1857,7 @@ tny_gtk_folder_list_store_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_folder_list_store_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1874,7 +1874,7 @@ tny_gtk_folder_list_store_column_register_type (gpointer notused)
       { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyGtkFolderListStoreColumn", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1889,5 +1889,5 @@ tny_gtk_folder_list_store_column_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_folder_list_store_column_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-folder-store-tree-model-iterator.c b/libtinymailui-gtk/tny-gtk-folder-store-tree-model-iterator.c
index 3940cc7..f121ea2 100644
--- a/libtinymailui-gtk/tny-gtk-folder-store-tree-model-iterator.c
+++ b/libtinymailui-gtk/tny-gtk-folder-store-tree-model-iterator.c
@@ -262,7 +262,7 @@ _tny_gtk_folder_store_tree_model_iterator_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ITERATOR, 
 				     &tny_iterator_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -270,5 +270,5 @@ _tny_gtk_folder_store_tree_model_iterator_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, _tny_gtk_folder_store_tree_model_iterator_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c b/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c
index 02f93d0..ac2992c 100644
--- a/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c
+++ b/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c
@@ -1467,7 +1467,7 @@ tny_gtk_folder_store_tree_model_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_FOLDER_OBSERVER,
 				     &tny_folder_observer_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -1482,7 +1482,7 @@ tny_gtk_folder_store_tree_model_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_folder_store_tree_model_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1499,7 +1499,7 @@ tny_gtk_folder_store_tree_model_column_register_type (gpointer notused)
       { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyGtkFolderStoreTreeModelColumn", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1514,5 +1514,5 @@ tny_gtk_folder_store_tree_model_column_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_folder_store_tree_model_column_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-header-list-iterator.c b/libtinymailui-gtk/tny-gtk-header-list-iterator.c
index 1dec722..490e0bd 100644
--- a/libtinymailui-gtk/tny-gtk-header-list-iterator.c
+++ b/libtinymailui-gtk/tny-gtk-header-list-iterator.c
@@ -332,7 +332,7 @@ _tny_gtk_header_list_iterator_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_ITERATOR, 
 				     &tny_iterator_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -340,5 +340,5 @@ _tny_gtk_header_list_iterator_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, _tny_gtk_header_list_iterator_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-header-list-model.c b/libtinymailui-gtk/tny-gtk-header-list-model.c
index fe63fd6..0f0496a 100644
--- a/libtinymailui-gtk/tny-gtk-header-list-model.c
+++ b/libtinymailui-gtk/tny-gtk-header-list-model.c
@@ -1381,7 +1381,7 @@ tny_gtk_header_list_model_register_type (gpointer notused)
 	g_type_add_interface_static (object_type, TNY_TYPE_LIST,
 				     &tny_list_info);
 
-	return GUINT_TO_POINTER (object_type);
+	return GSIZE_TO_POINTER (object_type);
 }
 
 /**
@@ -1396,7 +1396,7 @@ tny_gtk_header_list_model_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_header_list_model_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 
 static gpointer
@@ -1420,7 +1420,7 @@ tny_gtk_header_list_model_column_register_type (gpointer notused)
       { 0, NULL, NULL }
   };
   etype = g_enum_register_static ("TnyGtkHeaderListModelColumn", values);
-  return GUINT_TO_POINTER (etype);
+  return GSIZE_TO_POINTER (etype);
 }
 
 /**
@@ -1435,7 +1435,7 @@ tny_gtk_header_list_model_column_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_header_list_model_column_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
 void
 tny_gtk_header_list_model_set_update_in_batches (TnyGtkHeaderListModel *self,
diff --git a/libtinymailui-gtk/tny-gtk-header-view.c b/libtinymailui-gtk/tny-gtk-header-view.c
index f2e10af..b90078d 100644
--- a/libtinymailui-gtk/tny-gtk-header-view.c
+++ b/libtinymailui-gtk/tny-gtk-header-view.c
@@ -319,7 +319,7 @@ tny_gtk_header_view_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_HEADER_VIEW, 
 				     &tny_header_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -334,5 +334,5 @@ tny_gtk_header_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_header_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-image-mime-part-view.c b/libtinymailui-gtk/tny-gtk-image-mime-part-view.c
index 3df6233..2c46e05 100644
--- a/libtinymailui-gtk/tny-gtk-image-mime-part-view.c
+++ b/libtinymailui-gtk/tny-gtk-image-mime-part-view.c
@@ -252,7 +252,7 @@ tny_gtk_image_mime_part_view_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
 				     &tny_mime_part_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -260,5 +260,5 @@ tny_gtk_image_mime_part_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_image_mime_part_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-lockable.c b/libtinymailui-gtk/tny-gtk-lockable.c
index 39f1bae..a438bab 100644
--- a/libtinymailui-gtk/tny-gtk-lockable.c
+++ b/libtinymailui-gtk/tny-gtk-lockable.c
@@ -126,7 +126,7 @@ tny_gtk_lockable_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_LOCKABLE,
 				     &tny_lockable_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -134,5 +134,5 @@ tny_gtk_lockable_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_lockable_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-mime-part-save-strategy.c b/libtinymailui-gtk/tny-gtk-mime-part-save-strategy.c
index 6dd7361..c9a4e5d 100644
--- a/libtinymailui-gtk/tny-gtk-mime-part-save-strategy.c
+++ b/libtinymailui-gtk/tny-gtk-mime-part-save-strategy.c
@@ -297,7 +297,7 @@ tny_gtk_mime_part_save_strategy_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART_SAVE_STRATEGY, 
 				     &tny_gtk_mime_part_save_strategy_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -305,5 +305,5 @@ tny_gtk_mime_part_save_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_mime_part_save_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-msg-view.c b/libtinymailui-gtk/tny-gtk-msg-view.c
index 2885fbf..c39b09a 100644
--- a/libtinymailui-gtk/tny-gtk-msg-view.c
+++ b/libtinymailui-gtk/tny-gtk-msg-view.c
@@ -998,7 +998,7 @@ tny_gtk_msg_view_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MSG_VIEW, 
 				     &tny_msg_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 /**
@@ -1013,5 +1013,5 @@ tny_gtk_msg_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_msg_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-msg-window.c b/libtinymailui-gtk/tny-gtk-msg-window.c
index dd5dbb5..76927f1 100644
--- a/libtinymailui-gtk/tny-gtk-msg-window.c
+++ b/libtinymailui-gtk/tny-gtk-msg-window.c
@@ -406,7 +406,7 @@ tny_gtk_msg_window_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MSG_WINDOW, 
 				     &tny_msg_window_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -414,5 +414,5 @@ tny_gtk_msg_window_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_msg_window_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-password-dialog.c b/libtinymailui-gtk/tny-gtk-password-dialog.c
index 4bdb5e9..70ffa13 100644
--- a/libtinymailui-gtk/tny-gtk-password-dialog.c
+++ b/libtinymailui-gtk/tny-gtk-password-dialog.c
@@ -208,7 +208,7 @@ tny_gtk_password_dialog_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_PASSWORD_GETTER, 
 				     &tny_password_getter_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -216,5 +216,5 @@ tny_gtk_password_dialog_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_password_dialog_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-pixbuf-stream.c b/libtinymailui-gtk/tny-gtk-pixbuf-stream.c
index b2e3604..ce1fe6b 100644
--- a/libtinymailui-gtk/tny-gtk-pixbuf-stream.c
+++ b/libtinymailui-gtk/tny-gtk-pixbuf-stream.c
@@ -312,7 +312,7 @@ tny_gtk_pixbuf_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_STREAM, 
 				     &tny_stream_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -320,5 +320,5 @@ tny_gtk_pixbuf_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_pixbuf_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-text-buffer-stream.c b/libtinymailui-gtk/tny-gtk-text-buffer-stream.c
index 289125e..bd00234 100644
--- a/libtinymailui-gtk/tny-gtk-text-buffer-stream.c
+++ b/libtinymailui-gtk/tny-gtk-text-buffer-stream.c
@@ -398,7 +398,7 @@ tny_gtk_text_buffer_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_STREAM, 
 				     &tny_stream_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -406,5 +406,5 @@ tny_gtk_text_buffer_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_text_buffer_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtk/tny-gtk-text-mime-part-view.c b/libtinymailui-gtk/tny-gtk-text-mime-part-view.c
index 6a711d7..617d0bf 100644
--- a/libtinymailui-gtk/tny-gtk-text-mime-part-view.c
+++ b/libtinymailui-gtk/tny-gtk-text-mime-part-view.c
@@ -244,7 +244,7 @@ tny_gtk_text_mime_part_view_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
 				     &tny_mime_part_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -252,5 +252,5 @@ tny_gtk_text_mime_part_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_text_mime_part_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtkhtml/tny-gtk-html-mime-part-view.c b/libtinymailui-gtkhtml/tny-gtk-html-mime-part-view.c
index cf2ea26..8cf08ba 100644
--- a/libtinymailui-gtkhtml/tny-gtk-html-mime-part-view.c
+++ b/libtinymailui-gtkhtml/tny-gtk-html-mime-part-view.c
@@ -262,7 +262,7 @@ tny_gtk_html_mime_part_view_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
 				     &tny_mime_part_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -270,5 +270,5 @@ tny_gtk_html_mime_part_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_html_mime_part_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtkhtml/tny-gtk-html-msg-view.c b/libtinymailui-gtkhtml/tny-gtk-html-msg-view.c
index 4f748ff..73357b1 100644
--- a/libtinymailui-gtkhtml/tny-gtk-html-msg-view.c
+++ b/libtinymailui-gtkhtml/tny-gtk-html-msg-view.c
@@ -162,7 +162,7 @@ tny_gtk_html_msg_view_register_type (gpointer notused)
 				       "TnyGtkHtmlMsgView",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -170,5 +170,5 @@ tny_gtk_html_msg_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_html_msg_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-gtkhtml/tny-gtk-html-stream.c b/libtinymailui-gtkhtml/tny-gtk-html-stream.c
index 39a2f81..b16dae0 100644
--- a/libtinymailui-gtkhtml/tny-gtk-html-stream.c
+++ b/libtinymailui-gtkhtml/tny-gtk-html-stream.c
@@ -231,7 +231,7 @@ tny_gtk_html_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_STREAM, 
 				     &tny_stream_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -239,5 +239,5 @@ tny_gtk_html_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_gtk_html_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c b/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c
index da8ddf1..411fcf5 100644
--- a/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c
+++ b/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c
@@ -250,7 +250,7 @@ tny_moz_embed_html_mime_part_view_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
 				     &tny_mime_part_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -258,5 +258,5 @@ tny_moz_embed_html_mime_part_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_moz_embed_html_mime_part_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-mozembed/tny-moz-embed-msg-view.c b/libtinymailui-mozembed/tny-moz-embed-msg-view.c
index 3061149..2817b96 100644
--- a/libtinymailui-mozembed/tny-moz-embed-msg-view.c
+++ b/libtinymailui-mozembed/tny-moz-embed-msg-view.c
@@ -171,7 +171,7 @@ tny_moz_embed_msg_view_register_type (gpointer notused)
 				       "TnyMozEmbedMsgView",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -179,5 +179,5 @@ tny_moz_embed_msg_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_moz_embed_msg_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-mozembed/tny-moz-embed-stream.c b/libtinymailui-mozembed/tny-moz-embed-stream.c
index 1fc361a..a4a072b 100644
--- a/libtinymailui-mozembed/tny-moz-embed-stream.c
+++ b/libtinymailui-mozembed/tny-moz-embed-stream.c
@@ -361,7 +361,7 @@ tny_moz_embed_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_STREAM, 
 				     &tny_stream_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -369,5 +369,5 @@ tny_moz_embed_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_moz_embed_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-webkit/tny-webkit-html-mime-part-view.c b/libtinymailui-webkit/tny-webkit-html-mime-part-view.c
index 062c093..f397144 100644
--- a/libtinymailui-webkit/tny-webkit-html-mime-part-view.c
+++ b/libtinymailui-webkit/tny-webkit-html-mime-part-view.c
@@ -205,7 +205,7 @@ tny_webkit_html_mime_part_view_get_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
 				     &tny_mime_part_view_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -213,5 +213,5 @@ tny_webkit_html_mime_part_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_webkit_html_mime_part_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-webkit/tny-webkit-msg-view.c b/libtinymailui-webkit/tny-webkit-msg-view.c
index 7521f07..dfa6eb6 100644
--- a/libtinymailui-webkit/tny-webkit-msg-view.c
+++ b/libtinymailui-webkit/tny-webkit-msg-view.c
@@ -161,7 +161,7 @@ tny_webkit_msg_view_register_type (gpointer notused)
 				       "TnyWebkitMsgView",
 				       &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -169,5 +169,5 @@ tny_webkit_msg_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_webkit_msg_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui-webkit/tny-webkit-stream.c b/libtinymailui-webkit/tny-webkit-stream.c
index 0ef23e7..89bb3f0 100644
--- a/libtinymailui-webkit/tny-webkit-stream.c
+++ b/libtinymailui-webkit/tny-webkit-stream.c
@@ -223,7 +223,7 @@ tny_webkit_stream_register_type (gpointer notused)
 	g_type_add_interface_static (type, TNY_TYPE_STREAM, 
 				     &tny_stream_info);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType 
@@ -231,5 +231,5 @@ tny_webkit_stream_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_webkit_stream_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-account-store-view.c b/libtinymailui/tny-account-store-view.c
index f0057e5..ce49c5c 100644
--- a/libtinymailui/tny-account-store-view.c
+++ b/libtinymailui/tny-account-store-view.c
@@ -87,7 +87,7 @@ tny_account_store_view_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -95,5 +95,5 @@ tny_account_store_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_account_store_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-header-view.c b/libtinymailui/tny-header-view.c
index bd6ae34..3378bc6 100644
--- a/libtinymailui/tny-header-view.c
+++ b/libtinymailui/tny-header-view.c
@@ -111,7 +111,7 @@ tny_header_view_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -119,5 +119,5 @@ tny_header_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_header_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-mime-part-save-strategy.c b/libtinymailui/tny-mime-part-save-strategy.c
index f08448e..8266dd3 100644
--- a/libtinymailui/tny-mime-part-save-strategy.c
+++ b/libtinymailui/tny-mime-part-save-strategy.c
@@ -139,7 +139,7 @@ tny_mime_part_save_strategy_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -147,5 +147,5 @@ tny_mime_part_save_strategy_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_mime_part_save_strategy_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-mime-part-saver.c b/libtinymailui/tny-mime-part-saver.c
index dcf3a56..26ac948 100644
--- a/libtinymailui/tny-mime-part-saver.c
+++ b/libtinymailui/tny-mime-part-saver.c
@@ -171,7 +171,7 @@ tny_mime_part_saver_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyMimePartSaver", &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -179,5 +179,5 @@ tny_mime_part_saver_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_mime_part_saver_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-mime-part-view.c b/libtinymailui/tny-mime-part-view.c
index b19fa79..1545885 100644
--- a/libtinymailui/tny-mime-part-view.c
+++ b/libtinymailui/tny-mime-part-view.c
@@ -196,7 +196,7 @@ tny_mime_part_view_register_type (gpointer notused)
 	type = g_type_register_static (G_TYPE_INTERFACE, 
 				       "TnyMimePartView", &info, 0);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -204,5 +204,5 @@ tny_mime_part_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_mime_part_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-msg-view.c b/libtinymailui/tny-msg-view.c
index 669b3e0..c5c6208 100644
--- a/libtinymailui/tny-msg-view.c
+++ b/libtinymailui/tny-msg-view.c
@@ -272,7 +272,7 @@ tny_msg_view_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, TNY_TYPE_MIME_PART_VIEW);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -280,5 +280,5 @@ tny_msg_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_msg_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-msg-window.c b/libtinymailui/tny-msg-window.c
index c3a83d4..e5b41b0 100644
--- a/libtinymailui/tny-msg-window.c
+++ b/libtinymailui/tny-msg-window.c
@@ -64,7 +64,7 @@ tny_msg_window_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, TNY_TYPE_MSG_VIEW);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -72,5 +72,5 @@ tny_msg_window_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_msg_window_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-platform-factory.c b/libtinymailui/tny-platform-factory.c
index 51f3621..6079b2f 100644
--- a/libtinymailui/tny-platform-factory.c
+++ b/libtinymailui/tny-platform-factory.c
@@ -209,7 +209,7 @@ tny_platform_factory_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -217,5 +217,5 @@ tny_platform_factory_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_platform_factory_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }
diff --git a/libtinymailui/tny-summary-view.c b/libtinymailui/tny-summary-view.c
index 63d8d75..3ec57e4 100644
--- a/libtinymailui/tny-summary-view.c
+++ b/libtinymailui/tny-summary-view.c
@@ -55,7 +55,7 @@ tny_summary_view_register_type (gpointer notused)
 
 	g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
-	return GUINT_TO_POINTER (type);
+	return GSIZE_TO_POINTER (type);
 }
 
 GType
@@ -63,5 +63,5 @@ tny_summary_view_get_type (void)
 {
 	static GOnce once = G_ONCE_INIT;
 	g_once (&once, tny_summary_view_register_type, NULL);
-	return GPOINTER_TO_UINT (once.retval);
+	return GPOINTER_TO_SIZE (once.retval);
 }

Attachment: signature.asc
Description: OpenPGP digital signature

Follow-Ups:
- Re: [PATCH] Use GPOINTER_TO_SIZE (once.retval) to retrieve GType values.
  - From: Sergio Villar Senin

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]