Don't assume that GTimeVal is a long and use time_t instead Patch by

2009-03-03  Tobias Mueller  <tobiasmue@svn.gnome.org>

    * backends/vcf/e-book-backend-vcf.c (set_revision):
    * backends/file/e-book-backend-file.c (set_revision):
    Don't assume that GTimeVal is a long and use time_t instead
    Patch by Matthias Drochner.
    ** Fixes bug 569108

svn path=/trunk/; revision=10126

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 98c6f1c..fe96408 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-03  Tobias Mueller  <tobiasmue@svn.gnome.org>
+
+       * backends/vcf/e-book-backend-vcf.c (set_revision):
+       * backends/file/e-book-backend-file.c (set_revision):
+       Don't assume that GTimeVal is a long and use time_t instead
+       Patch by Matthias Drochner.
+       ** Fixes bug 569108
+
 2009-03-01  Tobias Mueller  <tobiasmue@svn.gnome.org>
 
        * backends/google/util.c: (_google_rel_from_types). (google_im_protocol_from_field_name):

diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 5323b9c..145083b 100644 (file)
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -174,10 +174,10 @@ set_revision (EContact *contact)
 {
        char time_string[100] = {0};
        const struct tm *tm = NULL;
-       GTimeVal tv;
+       time_t t;
 
-       g_get_current_time (&tv);
-       tm = gmtime (&tv.tv_sec);
+       t = time(NULL);
+       tm = gmtime (&t);
        if (tm)
                strftime (time_string, 100, "%Y-%m-%dT%H:%M:%SZ", tm);
        e_contact_set (contact, E_CONTACT_REV, time_string);

diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c
index 9bebc16..49fcb02 100644 (file)
--- a/addressbook/backends/vcf/e-book-backend-vcf.c
+++ b/addressbook/backends/vcf/e-book-backend-vcf.c
@@ -218,10 +218,10 @@ set_revision (EContact *contact)
 {
        char time_string[100] = {0};
        const struct tm *tm = NULL;
-       GTimeVal tv;
+       time_t t;
 
-       g_get_current_time (&tv);
-       tm = gmtime (&tv.tv_sec);
+       t = time(NULL);
+       tm = gmtime (&t);
        if (tm)
                strftime (time_string, 100, "%Y-%m-%dT%H:%M:%SZ", tm);
        e_contact_set (contact, E_CONTACT_REV, time_string);