diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-01-19 22:53:54 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-01-20 18:30:38 +0800 |
commit | 11de29cc7c7b7d6047837b51155b768b0e8f9a4b (patch) | |
tree | f7926d047b2d5a03e8a78d1aec1d073d9ed56d45 /libempathy | |
parent | 9221d9bab4675f79370ccb6e675a32f0e0c5a707 (diff) | |
download | gsoc2013-empathy-11de29cc7c7b7d6047837b51155b768b0e8f9a4b.tar gsoc2013-empathy-11de29cc7c7b7d6047837b51155b768b0e8f9a4b.tar.gz gsoc2013-empathy-11de29cc7c7b7d6047837b51155b768b0e8f9a4b.tar.bz2 gsoc2013-empathy-11de29cc7c7b7d6047837b51155b768b0e8f9a4b.tar.lz gsoc2013-empathy-11de29cc7c7b7d6047837b51155b768b0e8f9a4b.tar.xz gsoc2013-empathy-11de29cc7c7b7d6047837b51155b768b0e8f9a4b.tar.zst gsoc2013-empathy-11de29cc7c7b7d6047837b51155b768b0e8f9a4b.zip |
empathy-time: port to TP coding style
https://bugzilla.gnome.org/show_bug.cgi?id=608474
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/empathy-time.c | 155 | ||||
-rw-r--r-- | libempathy/empathy-time.h | 11 |
2 files changed, 85 insertions, 81 deletions
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c index 5144fa4d8..fb699f09c 100644 --- a/libempathy/empathy-time.c +++ b/libempathy/empathy-time.c @@ -1,7 +1,6 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2003-2007 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 @@ -34,110 +33,116 @@ gint64 empathy_time_get_current (void) { - GDateTime *now; - gint64 result; + GDateTime *now; + gint64 result; - now = g_date_time_new_now_utc (); - result = g_date_time_to_unix (now); - g_date_time_unref (now); + now = g_date_time_new_now_utc (); + result = g_date_time_to_unix (now); + g_date_time_unref (now); - return result; + return result; } -/* Converts the UTC timestamp to a string, also in UTC. Returns NULL on failure. */ +/* Converts the UTC timestamp to a string, also in UTC. + * Returns NULL on failure. */ gchar * -empathy_time_to_string_utc (gint64 t, - const gchar *format) +empathy_time_to_string_utc (gint64 t, + const gchar *format) { - GDateTime *d; - char *result; + GDateTime *d; + char *result; - g_return_val_if_fail (format != NULL, NULL); + g_return_val_if_fail (format != NULL, NULL); - d = g_date_time_new_from_unix_utc (t); - result = g_date_time_format (d, format); - g_date_time_unref (d); + d = g_date_time_new_from_unix_utc (t); + result = g_date_time_format (d, format); + g_date_time_unref (d); - return result; + return result; } -/* Converts the UTC timestamp to a string, in local time. Returns NULL on failure. */ +/* Converts the UTC timestamp to a string, in local time. + * Returns NULL on failure. */ gchar * empathy_time_to_string_local (gint64 t, - const gchar *format) + const gchar *format) { - GDateTime *d, *local; - gchar *result; + GDateTime *d, *local; + gchar *result; - g_return_val_if_fail (format != NULL, NULL); + g_return_val_if_fail (format != NULL, NULL); - d = g_date_time_new_from_unix_utc (t); - local = g_date_time_to_local (d); - g_date_time_unref (d); + d = g_date_time_new_from_unix_utc (t); + local = g_date_time_to_local (d); + g_date_time_unref (d); - result = g_date_time_format (local, format); - g_date_time_unref (local); + result = g_date_time_format (local, format); + g_date_time_unref (local); - return result; + return result; } gchar * empathy_duration_to_string (guint seconds) { - if (seconds < 60) { - return g_strdup_printf (ngettext ("%d second ago", - "%d seconds ago", seconds), seconds); - } - else if (seconds < (60 * 60)) { - seconds /= 60; - return g_strdup_printf (ngettext ("%d minute ago", - "%d minutes ago", seconds), seconds); - } - else if (seconds < (60 * 60 * 24)) { - seconds /= 60 * 60; - return g_strdup_printf (ngettext ("%d hour ago", - "%d hours ago", seconds), seconds); - } - else if (seconds < (60 * 60 * 24 * 7)) { - seconds /= 60 * 60 * 24; - return g_strdup_printf (ngettext ("%d day ago", - "%d days ago", seconds), seconds); - } - else if (seconds < (60 * 60 * 24 * 30)) { - seconds /= 60 * 60 * 24 * 7; - return g_strdup_printf (ngettext ("%d week ago", - "%d weeks ago", seconds), seconds); - } - else { - seconds /= 60 * 60 * 24 * 30; - return g_strdup_printf (ngettext ("%d month ago", - "%d months ago", seconds), seconds); - } + if (seconds < 60) + { + return g_strdup_printf (ngettext ("%d second ago", + "%d seconds ago", seconds), seconds); + } + else if (seconds < (60 * 60)) + { + seconds /= 60; + return g_strdup_printf (ngettext ("%d minute ago", + "%d minutes ago", seconds), seconds); + } + else if (seconds < (60 * 60 * 24)) + { + seconds /= 60 * 60; + return g_strdup_printf (ngettext ("%d hour ago", + "%d hours ago", seconds), seconds); + } + else if (seconds < (60 * 60 * 24 * 7)) + { + seconds /= 60 * 60 * 24; + return g_strdup_printf (ngettext ("%d day ago", + "%d days ago", seconds), seconds); + } + else if (seconds < (60 * 60 * 24 * 30)) + { + seconds /= 60 * 60 * 24 * 7; + return g_strdup_printf (ngettext ("%d week ago", + "%d weeks ago", seconds), seconds); + } + else + { + seconds /= 60 * 60 * 24 * 30; + return g_strdup_printf (ngettext ("%d month ago", + "%d months ago", seconds), seconds); + } } gchar * empathy_time_to_string_relative (gint64 t) { - GDateTime *now, *then; - gint seconds; - GTimeSpan delta; - gchar *result; + GDateTime *now, *then; + gint seconds; + GTimeSpan delta; + gchar *result; - now = g_date_time_new_now_utc (); - then = g_date_time_new_from_unix_utc (t); + now = g_date_time_new_now_utc (); + then = g_date_time_new_from_unix_utc (t); - delta = g_date_time_difference (now, then); - seconds = delta / G_TIME_SPAN_SECOND; + delta = g_date_time_difference (now, then); + seconds = delta / G_TIME_SPAN_SECOND; - if (seconds > 0) { - result = empathy_duration_to_string (seconds); - } - else { - result = g_strdup (_("in the future")); - } + if (seconds > 0) + result = empathy_duration_to_string (seconds); + else + result = g_strdup (_("in the future")); - g_date_time_unref (now); - g_date_time_unref (then); + g_date_time_unref (now); + g_date_time_unref (then); - return result; + return result; } diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h index 3a22adeee..16f441675 100644 --- 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 @@ -40,10 +39,10 @@ G_BEGIN_DECLS #define EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT _("%a %d %b %Y, %H:%M") 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); |