[Gaim-commits] SF.net SVN: gaim: [16581] branches/v2_0_0/src

[<the...@us...>]

Revision: 16581
Author:   thekingant
Date:     2006-07-25 23:42:59 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16581&view=rev

Log Message:
-----------
Make v2_0_0 compile by reverting two changes Sean just made

Modified Paths:
--------------
    branches/v2_0_0/src/gtkconv.c
    branches/v2_0_0/src/log.c
Modified: branches/v2_0_0/src/gtkconv.c
===================================================================
--- branches/v2_0_0/src/gtkconv.c	2006-07-26 04:03:34 UTC (rev 16580)
+++ branches/v2_0_0/src/gtkconv.c	2006-07-26 06:42:59 UTC (rev 16581)
@@ -6450,13 +6450,7 @@
 	                                    "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_marshal_POINTER__POINTER_POINTER,
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_CONVERSATION),

Modified: branches/v2_0_0/src/log.c
===================================================================
--- branches/v2_0_0/src/log.c	2006-07-26 04:03:34 UTC (rev 16580)
+++ branches/v2_0_0/src/log.c	2006-07-26 06:42:59 UTC (rev 16581)
@@ -593,13 +593,7 @@
 	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_marshal_POINTER__POINTER_POINTER,
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.