Fixes FwNULL 5/16

[modest] / src / modest-datetime-formatter.c

diff --git a/src/modest-datetime-formatter.c b/src/modest-datetime-formatter.c
index 277fea1..7aa9b24 100644 (file)
--- a/src/modest-datetime-formatter.c
+++ b/src/modest-datetime-formatter.c
@@ -31,10 +31,10 @@
 #include <modest-datetime-formatter.h>
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <gconf/gconf-client.h>
-#include <glib/gi18n.h>
-#include <modest-text-utils.h>
 #include <gtk/gtkmarshal.h>
 #endif
+#include <glib/gi18n.h>
+#include "modest-text-utils.h"
 
 typedef enum {
        DATETIME_FORMAT_12H,
@@ -116,7 +116,7 @@ modest_datetime_formatter_class_init (ModestDatetimeFormatterClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ModestDatetimeFormatterClass, format_changed),
                              NULL, NULL,
-                             gtk_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 }
 
@@ -264,7 +264,7 @@ modest_datetime_formatter_format_time (ModestDatetimeFormatter *self,
 
        switch (priv->current_format) {
        case DATETIME_FORMAT_12H:
-               format_string = is_pm?_HL("wdgt_12h_time_pm"):_HL("wdgt_12h_time_am");
+               format_string = is_pm?_HL("wdgt_va_12h_time_pm"):_HL("wdgt_va_12h_time_am");
                break;
        case DATETIME_FORMAT_24H:
                format_string = _HL("wdgt_va_24h_time");