Merge lp:~libzeitgeist-developers/libzeitgeist/timestamps into lp:libzeitgeist

[Mikkel Kamstrup Erlandsen]

Add a new namespace Zeitgeist.TimeStamp/zeitgeist_timestamp with convenience functions and constants for dealing with timestamps.

The following macros have been changed:

   - ZEITGEIST_TIMESTAMP_TO_GTIMEVAL is now zeitgeist_timestamp_to_timeval
   - ZEITGEIST_GTIMEVAL_TO_TIMESTAMP is now zeitgeist_timestamp_from_timeval

[lp:~libzeitgeist-developers/libzeitgeist/timestamps]

134. By Mikkel Kamstrup Erlandsen <kamstrup@hardback> on 2010-06-17

Vala: The Zeitgeist.Timestamp namespace should still include zeitgeist.h not zeitgeist-1.0-custom.h

=== modified file 'bindings/zeitgeist-1.0-custom.vala'
--- bindings/zeitgeist-1.0-custom.vala	2010-06-17 08:27:02 +0000
+++ bindings/zeitgeist-1.0-custom.vala	2010-06-17 14:14:24 +0000
@@ -30,11 +30,51 @@
     [CCode (cname = "_vala_zeitgeist_result_set_iterator")]
     public ResultSet iterator ();
   }
-  
-  [CCode (cname = "ZEITGEIST_GTIMEVAL_TO_TIMESTAMP")]
-  public static int64 timeval_to_timestamp (GLib.TimeVal time_val);
-  [CCode (cname = "ZEITGEIST_TIMESTAMP_TO_GTIMEVAL")]
-  public static GLib.TimeVal timestamp_to_timeval (int64 timestamp);
+}
+
+namespace Zeitgeist.Timestamp
+{
+  [CCode (cname = "ZEITGEIST_TIMESTAMP_SECOND", cheader_filename = "zeitgeist.h")]
+  public int64 SECOND;
+
+  [CCode (cname = "ZEITGEIST_TIMESTAMP_MINUTE", cheader_filename = "zeitgeist.h")]
+  public int64 MINUTE;
+
+  [CCode (cname = "ZEITGEIST_TIMESTAMP_HOUR", cheader_filename = "zeitgeist.h")]
+  public int64 HOUR;
+
+  [CCode (cname = "ZEITGEIST_TIMESTAMP_DAY", cheader_filename = "zeitgeist.h")]
+  public int64 DAY;
+
+  [CCode (cname = "ZEITGEIST_TIMESTAMP_WEEK", cheader_filename = "zeitgeist.h")]
+  public int64 WEEK;
+
+  [CCode (cname = "ZEITGEIST_TIMESTAMP_YEAR", cheader_filename = "zeitgeist.h")]
+  public int64 YEAR;
+
+  [CCode (cname = "zeitgeist_timestamp_for_now", cheader_filename = "zeitgeist.h")]
+  public int64 now ();
+
+  [CCode (cname = "zeitgeist_timestamp_from_timeval", cheader_filename = "zeitgeist.h")]
+  public int64 from_timeval (GLib.TimeVal tv);
+
+  [CCode (cname = "zeitgeist_timestamp_to_timeval", cheader_filename = "zeitgeist.h")]
+  public int64 to_timeval (int64 timestamp, out GLib.TimeVal tv);
+
+  [CCode (cname = "zeitgeist_timestamp_from_iso8601", cheader_filename = "zeitgeist.h")]
+  public int64 from_iso8601 (string datetime);
+
+  [CCode (cname = "zeitgeist_timestamp_to_iso8601", cheader_filename = "zeitgeist.h")]
+  public string to_iso8601 (int64 timestamp);
+
+  [CCode (cname = "zeitgeist_timestamp_from_date", cheader_filename = "zeitgeist.h")]
+  public int64 from_date (GLib.Date date);
+
+  [CCode (cname = "zeitgeist_timestamp_from_dmy", cheader_filename = "zeitgeist.h")]
+  public int64 from_dmy (GLib.DateDay day, GLib.DateMonth month, GLib.DateYear year);
+
+  [CCode (cname = "zeitgeist_timestamp_to_date", cheader_filename = "zeitgeist.h")]
+  public int64 to_date (int64 timestamp, out GLib.Date date);
 }
 
 // vim:et:ai:cindent:ts=2 sts=2 sw=2:
 
=== modified file 'bindings/zeitgeist-1.0.gi'
--- bindings/zeitgeist-1.0.gi	2010-06-10 09:43:09 +0000
+++ bindings/zeitgeist-1.0.gi	2010-06-17 14:14:24 +0000
@@ -34,6 +34,55 @@
 				<parameter name="manifestation_type" type="gchar*"/>
 			</parameters>
 		</function>
+		<function name="timestamp_for_now" symbol="zeitgeist_timestamp_for_now">
+			<return-type type="gint64"/>
+		</function>
+		<function name="timestamp_from_date" symbol="zeitgeist_timestamp_from_date">
+			<return-type type="gint64"/>
+			<parameters>
+				<parameter name="date" type="GDate*"/>
+			</parameters>
+		</function>
+		<function name="timestamp_from_dmy" symbol="zeitgeist_timestamp_from_dmy">
+			<return-type type="gint64"/>
+			<parameters>
+				<parameter name="day" type="GDateDay"/>
+				<parameter name="month" type="GDateMonth"/>
+				<parameter name="year" type="GDateYear"/>
+			</parameters>
+		</function>
+		<function name="timestamp_from_iso8601" symbol="zeitgeist_timestamp_from_iso8601">
+			<return-type type="gint64"/>
+			<parameters>
+				<parameter name="datetime" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="timestamp_from_timeval" symbol="zeitgeist_timestamp_from_timeval">
+			<return-type type="gint64"/>
+			<parameters>
+				<parameter name="tv" type="GTimeVal*"/>
+			</parameters>
+		</function>
+		<function name="timestamp_to_date" symbol="zeitgeist_timestamp_to_date">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="timestamp" type="gint64"/>
+				<parameter name="date" type="GDate*"/>
+			</parameters>
+		</function>
+		<function name="timestamp_to_iso8601" symbol="zeitgeist_timestamp_to_iso8601">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="timestamp" type="gint64"/>
+			</parameters>
+		</function>
+		<function name="timestamp_to_timeval" symbol="zeitgeist_timestamp_to_timeval">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="timestamp" type="gint64"/>
+				<parameter name="tv" type="GTimeVal*"/>
+			</parameters>
+		</function>
 		<enum name="ZeitgeistResultType" type-name="ZeitgeistResultType" get-type="zeitgeist_result_type_get_type">
 			<member name="ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENTS" value="0"/>
 			<member name="ZEITGEIST_RESULT_TYPE_LEAST_RECENT_EVENTS" value="1"/>
@@ -781,6 +830,12 @@
 		<constant name="ZEITGEIST_NMO_MAILBOX_DATA_OBJECT" type="char*" value="http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MailboxDataObject"/>
 		<constant name="ZEITGEIST_NMO_MESSAGE" type="char*" value="http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#Message"/>
 		<constant name="ZEITGEIST_NMO_MIME_ENTITY" type="char*" value="http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MimeEntity"/>
+		<constant name="ZEITGEIST_TIMESTAMP_DAY" type="int" value="86400000"/>
+		<constant name="ZEITGEIST_TIMESTAMP_HOUR" type="int" value="3600000"/>
+		<constant name="ZEITGEIST_TIMESTAMP_MINUTE" type="int" value="60000"/>
+		<constant name="ZEITGEIST_TIMESTAMP_SECOND" type="int" value="1000"/>
+		<constant name="ZEITGEIST_TIMESTAMP_WEEK" type="int" value="604800000"/>
+		<constant name="ZEITGEIST_TIMESTAMP_YEAR" type="int" value="2147483647"/>
 		<constant name="ZEITGEIST_ZG_ACCESS_EVENT" type="char*" value="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#AccessEvent"/>
 		<constant name="ZEITGEIST_ZG_CREATE_EVENT" type="char*" value="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#CreateEvent"/>
 		<constant name="ZEITGEIST_ZG_DELETE_EVENT" type="char*" value="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#DeleteEvent"/>
 
=== modified file 'bindings/zeitgeist-1.0.metadata'
--- bindings/zeitgeist-1.0.metadata	2010-06-16 13:18:59 +0000
+++ bindings/zeitgeist-1.0.metadata	2010-06-17 14:14:24 +0000
@@ -1,4 +1,5 @@
 Zeitgeist cheader_filename="zeitgeist.h"
+Zeitgeist.Timestamp cheader_filename="zeitgeist.h"
 zeitgeist_index_search async="1"
 zeitgeist_index_search.event_templates transfer_ownership="1"
 zeitgeist_index_search_finish transfer_ownership="1"
@@ -34,3 +35,6 @@
 
 zeitgeist_log_*.cancellable nullable="1"
 zeitgeist_index_*.cancellable nullable="1"
+
+zeitgeist_timestamp_* hidden="1"
+ZEITGEIST_TIMESTAMP_* hidden="1"
 
=== modified file 'bindings/zeitgeist-1.0.namespace'
--- bindings/zeitgeist-1.0.namespace	2010-04-19 11:11:55 +0000
+++ bindings/zeitgeist-1.0.namespace	2010-06-17 14:14:24 +0000
@@ -1,1 +1,2 @@
 Zeitgeist
+Zeitgeist.Timestamp
 
=== modified file 'bindings/zeitgeist-1.0.vapi'
--- bindings/zeitgeist-1.0.vapi	2010-06-17 08:27:02 +0000
+++ bindings/zeitgeist-1.0.vapi	2010-06-17 14:14:24 +0000
@@ -2,6 +2,37 @@
 
 [CCode (cprefix = "Zeitgeist", lower_case_cprefix = "zeitgeist_")]
 namespace Zeitgeist {
+	[CCode (cprefix = "ZeitgeistTimestamp", lower_case_cprefix = "zeitgeist_timestamp_")]
+	namespace Timestamp {
+		[CCode (cname = "ZEITGEIST_TIMESTAMP_DAY", cheader_filename = "zeitgeist.h")]
+		public static int64 DAY;
+		[CCode (cname = "ZEITGEIST_TIMESTAMP_HOUR", cheader_filename = "zeitgeist.h")]
+		public static int64 HOUR;
+		[CCode (cname = "ZEITGEIST_TIMESTAMP_MINUTE", cheader_filename = "zeitgeist.h")]
+		public static int64 MINUTE;
+		[CCode (cname = "ZEITGEIST_TIMESTAMP_SECOND", cheader_filename = "zeitgeist.h")]
+		public static int64 SECOND;
+		[CCode (cname = "ZEITGEIST_TIMESTAMP_WEEK", cheader_filename = "zeitgeist.h")]
+		public static int64 WEEK;
+		[CCode (cname = "ZEITGEIST_TIMESTAMP_YEAR", cheader_filename = "zeitgeist.h")]
+		public static int64 YEAR;
+		[CCode (cheader_filename = "zeitgeist.h")]
+		public static int64 from_date (GLib.Date date);
+		[CCode (cheader_filename = "zeitgeist.h")]
+		public static int64 from_dmy (GLib.DateDay day, GLib.DateMonth month, GLib.DateYear year);
+		[CCode (cheader_filename = "zeitgeist.h")]
+		public static int64 from_iso8601 (string datetime);
+		[CCode (cheader_filename = "zeitgeist.h")]
+		public static int64 from_timeval (GLib.TimeVal tv);
+		[CCode (cname = "zeitgeist_timestamp_for_now", cheader_filename = "zeitgeist.h")]
+		public static int64 now ();
+		[CCode (cheader_filename = "zeitgeist.h")]
+		public static int64 to_date (int64 timestamp, out GLib.Date date);
+		[CCode (cheader_filename = "zeitgeist.h")]
+		public static string to_iso8601 (int64 timestamp);
+		[CCode (cheader_filename = "zeitgeist.h")]
+		public static int64 to_timeval (int64 timestamp, out GLib.TimeVal tv);
+	}
 	[CCode (cheader_filename = "zeitgeist.h")]
 	public class Event : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
@@ -316,8 +347,4 @@
 	public static void register_mimetype_regex (string mimetype_regex, string interpretation_uri);
 	[CCode (cheader_filename = "zeitgeist.h")]
 	public static void register_uri_scheme (string uri_scheme, string manifestation_type);
-	[CCode (cname = "ZEITGEIST_TIMESTAMP_TO_GTIMEVAL", cheader_filename = "zeitgeist.h")]
-	public static GLib.TimeVal timestamp_to_timeval (int64 timestamp);
-	[CCode (cname = "ZEITGEIST_GTIMEVAL_TO_TIMESTAMP", cheader_filename = "zeitgeist.h")]
-	public static int64 timeval_to_timestamp (GLib.TimeVal time_val);
 }
 
=== modified file 'doc/reference/zeitgeist-1.0-docs.sgml'
--- doc/reference/zeitgeist-1.0-docs.sgml	2010-06-09 20:38:14 +0000
+++ doc/reference/zeitgeist-1.0-docs.sgml	2010-06-17 14:14:24 +0000
@@ -22,6 +22,7 @@
   <chapter>
     <title>Utility Functions</title>
     <xi:include href="xml/zeitgeist-mimetypes.xml"/>
+    <xi:include href="xml/zeitgeist-timestamp.xml"/>
   </chapter>
   
   <chapter>
 
=== modified file 'doc/reference/zeitgeist-1.0-sections.txt'
--- doc/reference/zeitgeist-1.0-sections.txt	2010-06-10 07:45:03 +0000
+++ doc/reference/zeitgeist-1.0-sections.txt	2010-06-17 14:14:24 +0000
@@ -3,8 +3,6 @@
 <TITLE>ZeitgeistTimeRange</TITLE>
 ZeitgeistTimeRange
 ZeitgeistTimeRangeClass
-ZEITGEIST_GTIMEVAL_TO_TIMESTAMP
-ZEITGEIST_TIMESTAMP_TO_GTIMEVAL
 zeitgeist_time_range_new
 zeitgeist_time_range_new_from_now
 zeitgeist_time_range_new_to_now
@@ -283,7 +281,7 @@
 <FILE>zeitgeist-result-set</FILE>
 <TITLE>ZeitgeistResultSet</TITLE>
 ZeitgeistResultSet
-ZeitgeistResultSetClass
+ZeitgeistResultSetIface
 zeitgeist_result_set_size
 zeitgeist_result_set_estimated_matches
 zeitgeist_result_set_next
@@ -297,4 +295,23 @@
 ZEITGEIST_TYPE_RESULT_SET
 ZEITGEIST_RESULT_SET_GET_IFACE
 zeitgeist_result_set_get_type
-</SECTION>
 \ No newline at end of file
+</SECTION>
+
+<SECTION>
+<FILE>zeitgeist-timestamp</FILE>
+<TITLE>Timestamp handling</TITLE>
+ZEITGEIST_TIMESTAMP_SECOND
+ZEITGEIST_TIMESTAMP_MINUTE
+ZEITGEIST_TIMESTAMP_HOUR
+ZEITGEIST_TIMESTAMP_DAY
+ZEITGEIST_TIMESTAMP_WEEK
+ZEITGEIST_TIMESTAMP_YEAR
+zeitgeist_timestamp_for_now
+zeitgeist_timestamp_from_timeval
+zeitgeist_timestamp_to_timeval
+zeitgeist_timestamp_from_iso8601
+zeitgeist_timestamp_to_iso8601
+zeitgeist_timestamp_from_date
+zeitgeist_timestamp_from_dmy
+zeitgeist_timestamp_to_date
+</SECTION>
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-06-09 21:15:49 +0000
+++ src/Makefile.am	2010-06-17 14:14:24 +0000
@@ -125,6 +125,8 @@
   zeitgeist-subject.h   \
   zeitgeist-timerange.c   \
   zeitgeist-timerange.h   \
+  zeitgeist-timestamp.c   \
+  zeitgeist-timestamp.h   \
   zeitgeist.h \
 	$(eggzeitgeist_sources) \
 	$(NULL)
@@ -151,6 +153,7 @@
   zeitgeist-result-set.h \
   zeitgeist-subject.h \
   zeitgeist-timerange.h \
+  zeitgeist-timestamp.h \
   zeitgeist.h
 
 devel_headers_HEADERS = \
 
=== modified file 'src/zeitgeist-event.c'
--- src/zeitgeist-event.c	2010-06-10 09:43:09 +0000
+++ src/zeitgeist-event.c	2010-06-17 14:14:24 +0000
@@ -134,7 +134,7 @@
  * Get the event timestamp. The timestamp is in milliseconds since the
  * Unix epoch. There are a few helpers available for converting to and
  * from other time representations such a #GTimeVal. See for example
- * ZEITGEIST_TIMESTAMP_TO_GTIMEVAL() and ZEITGEIST_GTIMEVAL_TO_TIMESTAMP().
+ * zeitgeist_timestamp_to_timeval() and zeitgeist_timestamp_from_timeval().
  *
  * Returns: The event timestamp. Note that 0 is ambiguous as it denotes both
  *          an unset timestamp and the time of the Unix Epoch.
@@ -155,7 +155,7 @@
  * Set the event timestamp. The timestamp is in milliseconds since the
  * Unix epoch. There are a few helpers available for converting to and
  * from other time representations such a #GTimeVal. See for example
- * ZEITGEIST_TIMESTAMP_TO_GTIMEVAL() and ZEITGEIST_GTIMEVAL_TO_TIMESTAMP().
+ * zeitgeist_timestamp_to_timeval() and zeitgeist_timestamp_from_timeval().
  *
  * Note that the if you insert events into the Zeitgeist log without a
  * timestamp set the Zeiteist daemon will automatically assign the timestamp
 
=== modified file 'src/zeitgeist-timerange.c'
--- src/zeitgeist-timerange.c	2010-04-22 12:31:21 +0000
+++ src/zeitgeist-timerange.c	2010-06-17 14:14:24 +0000
@@ -112,7 +112,7 @@
   GTimeVal            tv;
 
   g_get_current_time (&tv);
-  time_range = zeitgeist_time_range_new (ZEITGEIST_GTIMEVAL_TO_TIMESTAMP (&tv),
+  time_range = zeitgeist_time_range_new (zeitgeist_timestamp_from_timeval (&tv),
                                          G_MAXINT64);
 
   return time_range;
@@ -132,7 +132,7 @@
 
   g_get_current_time (&tv);
   time_range =
-           zeitgeist_time_range_new (0, ZEITGEIST_GTIMEVAL_TO_TIMESTAMP (&tv));
+           zeitgeist_time_range_new (0, zeitgeist_timestamp_from_timeval (&tv));
 
   return time_range;
 }
@@ -204,8 +204,8 @@
 
   g_return_val_if_fail (ZEITGEIST_IS_TIME_RANGE (time_range), NULL);
 
-  ZEITGEIST_TIMESTAMP_TO_GTIMEVAL (zeitgeist_time_range_get_start (time_range),
-                                     &tv);
+  zeitgeist_timestamp_to_timeval (zeitgeist_time_range_get_start (time_range),
+                                  &tv);
   return g_time_val_to_iso8601 (&tv);
 }
 
@@ -227,7 +227,7 @@
 
   g_return_val_if_fail (ZEITGEIST_IS_TIME_RANGE (time_range), NULL);
 
-  ZEITGEIST_TIMESTAMP_TO_GTIMEVAL (zeitgeist_time_range_get_end (time_range),
-                                     &tv);
+  zeitgeist_timestamp_to_timeval (zeitgeist_time_range_get_end (time_range),
+                                  &tv);
   return g_time_val_to_iso8601 (&tv);
 }
 
=== modified file 'src/zeitgeist-timerange.h'
--- src/zeitgeist-timerange.h	2010-06-16 13:17:00 +0000
+++ src/zeitgeist-timerange.h	2010-06-17 14:14:24 +0000
@@ -49,30 +49,6 @@
   GInitiallyUnowned parent_instance;
 };
 
-/**
- * ZEITGEIST_GTIMEVAL_TO_TIMESTAMP:
- * @gtimeval: A #GTimeVal instance
- *
- * Returns: A #gint64 with the total number of milliseconds since the Unix Epoch
- */
-#define     ZEITGEIST_GTIMEVAL_TO_TIMESTAMP(gtimeval) \
-              (((gint64)(gtimeval)->tv_sec)*1000 + ((gint64)(gtimeval)->tv_usec)/1000)
-
-/**
- * ZEITGEIST_TIMESTAMP_TO_GTIMEVAL:
- * @timestamp: A #gint64 with a number of milliseconds since the Unix Epoch
- * @gtimeval: A #GTimeVal instance to store the result in
- *
- * Write a Zeitgeist timestamp to a #GTimeVal instance. Note that Zeitgeist
- * uses only a millisecond resolution for where #GTimeVal uses a microsecond
- * resolution, meaning that the lower three digits of @gtimeval.tv_usec will
- * be 0.
- * 
- * Returns: Nothing. The result is stored in @gtimeval
- */
-#define     ZEITGEIST_TIMESTAMP_TO_GTIMEVAL(systime, gtimeval) \
-        ((gtimeval)->tv_sec = systime/1000, (gtimeval)->tv_usec = (systime%1000)*1000)
-
 GType       zeitgeist_time_range_get_type      (void);
 
 ZeitgeistTimeRange*
 
=== added file 'src/zeitgeist-timestamp.c'
--- src/zeitgeist-timestamp.c	1970-01-01 00:00:00 +0000
+++ src/zeitgeist-timestamp.c	2010-06-17 14:14:24 +0000
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2010 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by
+ *             Mikkel Kamstrup Erlandsen <[e-mail]>
+ */
+
+#include "zeitgeist-timerange.h"
+
+/**
+ * SECTION:zeitgeist-timestamp
+ * @short_description: Convenience functions for dealing with timestamps and dates
+ * @include: zeitgeist.h
+ *
+ * A suite of convenience functions for dealing with timestamps and dates.
+ *
+ * Zeitgeist timestamps are represented as #gint64<!-- -->s with the number
+ * of milliseconds since the Unix Epoch. 
+ */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "zeitgeist-timestamp.h"
+
+/**
+ * zeitgeist_timestamp_from_timeval:
+ * @tv: A #GTimeVal instance
+ *
+ * Returns: A #gint64 with the total number of milliseconds since the Unix Epoch
+ */
+gint64
+zeitgeist_timestamp_from_timeval (GTimeVal *tv)
+{
+  g_return_if_fail (tv != NULL);
+
+  return (((gint64)tv->tv_sec)*1000 + ((gint64)tv->tv_usec)/1000);
+}
+
+/**
+ * zeitgeist_timestamp_to_timeval:
+ * @timestamp: A #gint64 with a number of milliseconds since the Unix Epoch
+ * @tv: A #GTimeVal instance to store the result in
+ *
+ * Write a Zeitgeist timestamp to a #GTimeVal instance. Note that Zeitgeist
+ * uses only a millisecond resolution for where #GTimeVal uses a microsecond
+ * resolution, meaning that the lower three digits of @tv.tv_usec will
+ * be 0.
+ * 
+ * Returns: Nothing. The result is stored in @tv
+ */
+void
+zeitgeist_timestamp_to_timeval (gint64 timestamp, GTimeVal *tv)
+{
+  g_return_if_fail (tv != NULL);
+
+  tv->tv_sec = timestamp / 1000;
+  tv->tv_usec = (timestamp % 1000) * 1000;
+}
+        
+/**
+ * zeitgeist_timestamp_for_now:
+ *
+ * Get the timestamp for the current system time
+ *
+ * Returns: The timestamp for the current system time. Ie. the number of
+ *          milliseconds since the Unix Epoch
+ */
+gint64
+zeitgeist_timestamp_for_now (void)
+{
+  GTimeVal            tv;
+
+  g_get_current_time (&tv);
+  return zeitgeist_timestamp_from_timeval (&tv);
+}
+
+/**
+ * zeitgeist_timestamp_from_iso8601:
+ * @datetime: A string containing an iso8601 conforming datetime specification
+ *
+ * Parse a timestamp from a ISO8601 encoded string.
+ *
+ * Returns: The timestamp represented by @datetime, or -1 on failure to parse
+ *          @datetime
+ */
+gint64
+zeitgeist_timestamp_from_iso8601 (const gchar *datetime)
+{
+  GTimeVal            tv;
+  
+  g_return_if_fail (datetime != NULL);
+  
+  if (g_time_val_from_iso8601 (datetime, &tv))
+    return zeitgeist_timestamp_from_timeval (&tv);
+  else
+    return -1;
+}
+
+/**
+ * zeitgeist_timestamp_to_iso8601:
+ * @timestamp: A Zeitgeist timestamp in ms since the Epoch
+ *
+ * Convert a timestamp to a human readable ISO8601 format
+ *
+ * Returns: A newly allocated string containing the ISO8601 format of
+ *          @timestamp. Free with g_free().
+ */
+gchar*
+zeitgeist_timestamp_to_iso8601 (gint64 timestamp)
+{
+  GTimeVal            tv;
+  
+  zeitgeist_timestamp_to_timeval (timestamp, &tv);
+  return g_time_val_to_iso8601 (&tv);
+}
+
+/**
+ * zeitgeist_timestamp_from_date:
+ * @date: A #GDate to convert
+ *
+ * Convert a #GDate to a Zeitgeist timestamp.
+ *
+ * Returns: @date as a timestamp in milliseconds since the Epoch
+ */
+gint64
+zeitgeist_timestamp_from_date (GDate *date)
+{
+  g_return_val_if_fail (date != NULL, -1);
+  
+  gint64 julian = g_date_get_julian (date);
+  
+  gint64 foo = ZEITGEIST_TIMESTAMP_YEAR;
+  
+  return julian*ZEITGEIST_TIMESTAMP_DAY - 1969*ZEITGEIST_TIMESTAMP_YEAR;
+}
+
+/**
+ * zeitgeist_timestamp_from_dmy:
+ * @day: The day of the month represented as a #GDateDay
+ * @month: The month of the year represented as a #GDateMonth
+ * @year: The year represented as a #GDateYear
+ *
+ * Convert a day, month, year tuple into a Zeitgeist timestamp
+ *
+ * Returns: Input data as a timestamp in milliseconds since the Epoch or
+ *          -1 in case the provided data does not constitute a valid date
+ */
+gint64
+zeitgeist_timestamp_from_dmy (GDateDay day,
+                              GDateMonth month,
+                              GDateYear year)
+{
+  GDate date = { 0 };
+  
+  g_return_val_if_fail (g_date_valid_dmy (day, month, year), -1);
+  
+  g_date_set_dmy (&date, day, month, year);
+  return zeitgeist_timestamp_from_date (&date);
+}
+
+/**
+ * zeitgeist_timestamp_to_date:
+ * @timestamp: The Zeitgeist timestamp to convert to a #GDate
+ * @date: The place to store the result in. Must be non-%NULL
+ *
+ * Write a timestamp to a #GDate structure
+ *
+ * Returns: Nothing. The return value is written to @date
+ */
+void
+zeitgeist_timestamp_to_date (gint64 timestamp,
+                             GDate *date)
+{
+  GTimeVal            tv;
+  
+  g_return_if_fail (date != NULL);
+  
+  zeitgeist_timestamp_to_timeval (timestamp, &tv);
+  g_date_set_time_val (date, &tv);
+}
 
=== added file 'src/zeitgeist-timestamp.h'
--- src/zeitgeist-timestamp.h	1970-01-01 00:00:00 +0000
+++ src/zeitgeist-timestamp.h	2010-06-17 14:14:24 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2010 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by
+ *             Mikkel Kamstrup Erlandsen <[e-mail]>
+ */
+
+#if !defined (_ZEITGEIST_H_INSIDE_) && !defined (ZEITGEIST_COMPILATION)
+#error "Only <zeitgeist.h> can be included directly."
+#endif
+
+#ifndef _ZEITGEIST_TIMESTAMP_H_
+#define _ZEITGEIST_TIMESTaMP_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/**
+ * ZEITGEIST_TIMESTAMP_SECOND:
+ *
+ * A second represented as a Zeitgeist timestamp (ie. 1000ms)
+ */
+#define ZEITGEIST_TIMESTAMP_SECOND 1000LL
+
+/**
+ * ZEITGEIST_TIMESTAMP_MINUTE:
+ *
+ * A minute represented as a Zeitgeist timestamp (ie. 60000ms)
+ */
+#define ZEITGEIST_TIMESTAMP_MINUTE 60000LL
+
+/**
+ * ZEITGEIST_TIMESTAMP_HOUR:
+ *
+ * An hour represented as a Zeitgeist timestamp (ie. 3600000ms)
+ */
+#define ZEITGEIST_TIMESTAMP_HOUR 3600000LL
+
+/**
+ * ZEITGEIST_TIMESTAMP_DAY:
+ *
+ * A day represented as a Zeitgeist timestamp (ie. 86400000ms)
+ */
+#define ZEITGEIST_TIMESTAMP_DAY 86400000LL
+
+/**
+ * ZEITGEIST_TIMESTAMP_WEEK:
+ *
+ * A week represented as a Zeitgeist timestamp (ie. 604800000ms)
+ */
+#define ZEITGEIST_TIMESTAMP_WEEK 604800000LL
+
+/**
+ * ZEITGEIST_TIMESTAMP_YEAR:
+ *
+ * A year represented as a Zeitgeist timestamp (ie. 31556952000ms).
+ * Be warned that a year is not 365 days, but in fact 365.2425 days to
+ * account for leap years.
+ */
+#define ZEITGEIST_TIMESTAMP_YEAR 31556952000LL
+
+gint64       zeitgeist_timestamp_for_now            (void);
+
+gint64       zeitgeist_timestamp_from_timeval       (GTimeVal    *tv);
+
+void         zeitgeist_timestamp_to_timeval         (gint64       timestamp,
+                                                     GTimeVal    *tv);
+
+gint64       zeitgeist_timestamp_from_iso8601       (const gchar *datetime);
+
+gchar*       zeitgeist_timestamp_to_iso8601         (gint64       timestamp);
+
+gint64       zeitgeist_timestamp_from_date          (GDate       *date);
+
+gint64       zeitgeist_timestamp_from_dmy           (GDateDay     day,
+                                                     GDateMonth   month,
+                                                     GDateYear    year);
+
+void         zeitgeist_timestamp_to_date            (gint64       timestamp,
+                                                     GDate       *date);
+
+
+
+G_END_DECLS
+
+#endif /* _ZEITGEIST_TIMESTAMP_H_ */
 
=== modified file 'src/zeitgeist.h'
--- src/zeitgeist.h	2010-06-09 20:38:14 +0000
+++ src/zeitgeist.h	2010-06-17 14:14:24 +0000
@@ -35,6 +35,7 @@
 #include <zeitgeist-result-set.h>
 #include <zeitgeist-subject.h>
 #include <zeitgeist-timerange.h>
+#include <zeitgeist-timestamp.h>
 
 #undef _ZEITGEIST_H_INSIDE_
 
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-06-10 10:19:33 +0000
+++ tests/Makefile.am	2010-06-17 14:14:24 +0000
@@ -34,6 +34,10 @@
 test_timerange_SOURCES = test-timerange.c $(helper_sources)
 test_timerange_LDADD   = $(zeitgeist_libs)
 
+TEST_PROGS            += test-timestamp
+test_timestamp_SOURCES = test-timestamp.c $(helper_sources)
+test_timestamp_LDADD   = $(zeitgeist_libs)
+
 TEST_PROGS          += test-monitor
 test_monitor_SOURCES = test-monitor.c $(helper_sources)
 test_monitor_LDADD   = $(zeitgeist_libs)
 
=== added file 'tests/test-timestamp.c'
--- tests/test-timestamp.c	1970-01-01 00:00:00 +0000
+++ tests/test-timestamp.c	2010-06-17 14:14:24 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include "zeitgeist-timestamp.h"
+
+typedef struct
+{
+  
+} Fixture;
+
+static void setup    (Fixture *fix, gconstpointer data);
+static void teardown (Fixture *fix, gconstpointer data);
+
+static void
+setup (Fixture *fix, gconstpointer data)
+{
+  
+}
+
+static void
+teardown (Fixture *fix, gconstpointer data)
+{
+  
+}
+
+static void
+test_from_iso8601 (Fixture *fix, gconstpointer data)
+{
+  const gchar *orig = "2010-06-17T00:00:00Z";
+  gint64 from_iso = zeitgeist_timestamp_from_iso8601 (orig);
+  gchar *d = zeitgeist_timestamp_to_iso8601 (from_iso);
+  
+  g_assert_cmpstr (orig, ==, d);
+  g_free (d);
+}
+
+static void
+test_inc_year (Fixture *fix, gconstpointer data)
+{
+  gchar *d = zeitgeist_timestamp_to_iso8601 (ZEITGEIST_TIMESTAMP_YEAR);
+  
+  // Since ZEITGEIST_TIMESTAMP_YEAR accounts for leap years we wont exactly
+  // match "1971-01-01T00:00:00Z" on the hour
+  g_assert (g_str_has_prefix (d, "1971-01-01T"));
+  g_free (d);
+}
+
+static void
+test_from_date (Fixture *fix, gconstpointer data)
+{
+  GDate date = { 0 };
+
+  g_date_set_dmy (&date, 25, G_DATE_JUNE, 2000);
+  gint64 from_date = zeitgeist_timestamp_from_date (&date);
+  
+  gchar *d = zeitgeist_timestamp_to_iso8601 (from_date);
+  
+  // Since ZEITGEIST_TIMESTAMP_YEAR accounts for leap years we wont exactly
+  // match "2000-06-25T00:00:00Z" on the hour
+  g_assert (g_str_has_prefix (d, "2000-06-25T"));
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  g_type_init ();
+  g_test_init (&argc, &argv, NULL);
+  
+  g_test_add ("/Zeitgeist/TimeRange/FromISO8601", Fixture, NULL,
+              setup, test_from_iso8601, teardown);
+  g_test_add ("/Zeitgeist/TimeRange/IncrementYear", Fixture, NULL,
+              setup, test_inc_year, teardown);
+  g_test_add ("/Zeitgeist/TimeRange/FromDate", Fixture, NULL,
+              setup, test_from_date, teardown);
+  
+  return g_test_run();
+}
 \ No newline at end of file