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 2875d2f9f57bb98dc09c6e9681417e5d5cc10471..59bd9269bd36b37a097896213692cfcf7876f31b 100644 (file)
--- a/libempathy/empathy-time.h
+++ b/libempathy/empathy-time.h
@@ -1,21 +1,20 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2004 Imendio AB
+ * Copyright (C) 2007-2012 Collabora Ltd.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * 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
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __EMPATHY_TIME_H__
@@ -30,17 +29,19 @@
 
 G_BEGIN_DECLS
 
-#define EMPATHY_TIME_FORMAT_DISPLAY_SHORT "%H:%M"
-#define EMPATHY_TIME_FORMAT_DISPLAY_LONG  "%a %d %b %Y"
-
-time_t  empathy_time_get_current     (void);
-time_t  empathy_time_get_local_time  (struct tm   *tm);
-time_t  empathy_time_parse           (const gchar *str);
-gchar  *empathy_time_to_string_utc   (time_t       t,
-                                     const gchar *format);
-gchar  *empathy_time_to_string_local (time_t       t,
-                                     const gchar *format);
-gchar  *empathy_time_to_string_relative (time_t t);
+/* 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_relative (gint64 t);
+gchar *empathy_duration_to_string (guint seconds);
 
 G_END_DECLS