individual-menu: remove link-contacts-activated signal

[empathy.git] / libempathy / empathy-time.h

diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
index 7fac48221ae91ecbfcaf4e961c64349e92fcb56a..59bd9269bd36b37a097896213692cfcf7876f31b 100644 (file)
--- a/libempathy/empathy-time.h
+++ b/libempathy/empathy-time.h
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2004 Imendio AB
- * Copyright (C) 2007-2010 Collabora Ltd.
+ * Copyright (C) 2007-2012 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,21 +29,19 @@
 
 G_BEGIN_DECLS
 
-/*
- * Translators: use your locale preferred time format.
- * The fields follow the strftime standard:
- * look at the manual if you need help (man strftime)
- */
-#define EMPATHY_TIME_FORMAT_DISPLAY_SHORT _("%H:%M")
-#define EMPATHY_DATE_FORMAT_DISPLAY_SHORT  _("%a %d %b %Y")
-#define EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT _("%a %d %b %Y, %H:%M")
+/* FIXME: ideally we should only display the hour and minutes but
+ * there is no localized format for that (bgo #668323) */
+#define EMPATHY_TIME_FORMAT_DISPLAY_SHORT "%X"
+#define EMPATHY_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y"
+#define EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y, %X"
 
 gint64  empathy_time_get_current     (void);
-gchar  *empathy_time_to_string_utc   (gint64       t,
-                                     const gchar *format);
-gchar  *empathy_time_to_string_local (gint64       t,
-                                     const gchar *format);
+gchar  *empathy_time_to_string_utc   (gint64 t,
+    const gchar *format);
+gchar  *empathy_time_to_string_local (gint64 t,
+    const gchar *format);
 gchar  *empathy_time_to_string_relative (gint64 t);
+gchar *empathy_duration_to_string (guint seconds);
 
 G_END_DECLS