# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1153848869 0
# Node ID ef338033b1389c7ad60b3d7f8210abcee5d2053a
# Parent  626977ae8869df65326f722015ba5cedad7dc7c0
[gaim-migrate @ 16573]
Didn't mean to revert that.

committer: Tailor Script <tailor@pidgin.im>

diff -r 626977ae8869 -r ef338033b138 src/gtkconv.c
--- a/src/gtkconv.c	Tue Jul 25 17:30:03 2006 +0000
+++ b/src/gtkconv.c	Tue Jul 25 17:34:29 2006 +0000
@@ -6518,7 +6518,13 @@
 	                                    "GaimGtkWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
+#if SIZEOF_TIME_T == 4
 	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+#error Unkown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),
diff -r 626977ae8869 -r ef338033b138 src/log.c
--- a/src/log.c	Tue Jul 25 17:30:03 2006 +0000
+++ b/src/log.c	Tue Jul 25 17:34:29 2006 +0000
@@ -594,7 +594,13 @@
 	gaim_log_logger_add(old_logger);
 
 	gaim_signal_register(handle, "log-timestamp",
+#if SIZEOF_TIME_T == 4
 	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+#error Unknown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),