Fix modest_tny_msg_header_get_all_recipients_list (in case from is empty)
[modest] / src / modest-datetime-formatter.c
index 630022b..db50dc1 100644 (file)
 #endif
 #include <glib/gi18n.h>
 #include "modest-text-utils.h"
+#ifdef MODEST_USE_LIBTIME
+#include <clockd/libtime.h>
+#include <libosso.h>
+#include <modest-platform.h>
+#endif
 
 typedef enum {
        DATETIME_FORMAT_12H,
@@ -156,6 +161,15 @@ clock_format_changed (GConfClient *gconf,
 }
 #endif
 
+#ifdef MODEST_USE_LIBTIME
+static void 
+time_changed_cb (gpointer userdata)
+{
+       time_get_synced ();
+       g_signal_emit (G_OBJECT (userdata), signals[FORMAT_CHANGED_SIGNAL], 0);
+}
+#endif
+
 static void
 init_format (ModestDatetimeFormatter *obj)
 {
@@ -181,17 +195,22 @@ init_format (ModestDatetimeFormatter *obj)
                g_warning ("Error listening to time format in gconf %s", err->message);
                g_error_free (err);
        }
+
        update_format (obj);
 #endif
+
+#ifdef MODEST_USE_LIBTIME
+       osso_time_set_notification_cb (modest_platform_get_osso_context (),
+                                      time_changed_cb,
+                                      obj);
+       time_get_synced ();
+#endif
+
 }
 
 static void
 modest_datetime_formatter_instance_init (ModestDatetimeFormatter *obj)
 {
-       ModestDatetimeFormatterPrivate *priv;
-
-       priv = MODEST_DATETIME_FORMATTER_GET_PRIVATE (obj);
-
        init_format (obj);
 }
 
@@ -209,6 +228,11 @@ modest_datetime_formatter_finalize   (GObject *obj)
        priv->gconf_handler = 0;
        gconf_client_remove_dir (gconf, HILDON2_GCONF_FORMAT_DIR,
                                 NULL);
+
+       /* Disconnect notification */
+#ifdef MODEST_USE_LIBTIME
+       osso_time_set_notification_cb (modest_platform_get_osso_context (), NULL, NULL);
+#endif
 #endif
        G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
@@ -257,12 +281,16 @@ modest_datetime_formatter_format_time (ModestDatetimeFormatter *self,
        const gchar *format_string = NULL;
        gboolean is_pm;
        struct tm localtime_tm = {0, };
-       time_t date_copy;
 
        g_return_val_if_fail (MODEST_IS_DATETIME_FORMATTER (self), NULL);
        priv = MODEST_DATETIME_FORMATTER_GET_PRIVATE (self);
+#ifdef MODEST_USE_LIBTIME
+       time_get_local_ex (date, &localtime_tm);
+#else
+       time_t date_copy;
        date_copy = date;
        localtime_r (&date_copy, &localtime_tm);
+#endif
        is_pm = (localtime_tm.tm_hour/12) % 2;
 
        switch (priv->current_format) {
@@ -302,10 +330,25 @@ modest_datetime_formatter_display_datetime (ModestDatetimeFormatter *self,
                                            time_t date)
 {
 
-       int day = time (NULL) / (24*60*60);
-       int date_day = date / (24*60*60);
+       struct tm today_localtime_tm = {0, };
+       struct tm date_localtime_tm = {0, };
+       time_t today;
+
+       today = time (NULL);
+#ifdef MODEST_USE_LIBTIME
+       time_get_local_ex (today, &today_localtime_tm);
+       time_get_local_ex (date, &date_localtime_tm);
+#else
+       time_t date_copy;
+       date_copy = today;
+       localtime_r (&date_copy, &today_localtime_tm);
+       date_copy = date;
+       localtime_r (&date_copy, &date_localtime_tm);
+#endif
 
-       if (day == date_day)
+       if (today_localtime_tm.tm_mday == date_localtime_tm.tm_mday &&
+           today_localtime_tm.tm_mon == date_localtime_tm.tm_mon &&
+           today_localtime_tm.tm_year == date_localtime_tm.tm_year)
                return modest_datetime_formatter_format_time (self, date);
        else
                return modest_datetime_formatter_format_date (self, date);