time: move from Empathy to tp-account-widgets

https://bugzilla.gnome.org/show_bug.cgi?id=699492

5 files changed, 6 insertions, 200 deletions

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index d80c39523..b75c35a8a 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -49,7 +49,6 @@ libempathy_headers =				\
 	empathy-server-sasl-handler.h		\
 	empathy-server-tls-handler.h		\
 	empathy-status-presets.h		\
-	empathy-time.h				\
 	empathy-tls-verifier.h			\
 	empathy-tp-chat.h			\
 	empathy-types.h				\
@@ -78,7 +77,6 @@ libempathy_handwritten_source =				\
 	empathy-server-sasl-handler.c			\
 	empathy-server-tls-handler.c			\
 	empathy-status-presets.c			\
-	empathy-time.c					\
 	empathy-tls-verifier.c				\
 	empathy-tp-chat.c				\
 	empathy-utils.c
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 96c8e47f5..049489c4e 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -25,8 +25,8 @@
 #include "empathy-ft-handler.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-time.h>
 
-#include "empathy-time.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_FT
@@ -643,7 +643,7 @@ update_remaining_time_and_speed (EmpathyFTHandler *handler,
   last_transferred_bytes = priv->transferred_bytes;
   priv->transferred_bytes = transferred_bytes;
 
-  current_time = empathy_time_get_current ();
+  current_time = tpaw_time_get_current ();
   elapsed_time = current_time - priv->last_update_time;
 
   if (elapsed_time >= 1)
@@ -672,7 +672,7 @@ ft_transfer_transferred_bytes_cb (TpFileTransferChannel *channel,
 
   if (priv->transferred_bytes == 0)
     {
-      priv->last_update_time = empathy_time_get_current ();
+      priv->last_update_time = tpaw_time_get_current ();
       g_signal_emit (handler, signals[TRANSFER_STARTED], 0, channel);
     }
 
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 1115eddda..d6f30a678 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -26,9 +26,9 @@
 #include "empathy-message.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-time.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-time.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
 
@@ -196,7 +196,7 @@ empathy_message_init (EmpathyMessage *message)
 		EMPATHY_TYPE_MESSAGE, EmpathyMessagePriv);
 
 	message->priv = priv;
-	priv->timestamp = empathy_time_get_current ();
+	priv->timestamp = tpaw_time_get_current ();
 }
 
 static void
@@ -314,7 +314,7 @@ message_set_property (GObject      *object,
 	case PROP_TIMESTAMP:
 		priv->timestamp = g_value_get_int64 (value);
 		if (priv->timestamp <= 0)
-			priv->timestamp = empathy_time_get_current ();
+			priv->timestamp = tpaw_time_get_current ();
 		break;
 	case PROP_ORIGINAL_TIMESTAMP:
 		priv->original_timestamp = g_value_get_int64 (value);
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
deleted file mode 100644
index d14f2c4cc..000000000
--- a/libempathy/empathy-time.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2003-2007 Imendio AB
- * 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
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * 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
- *
- * Authors: Richard Hult <richard@imendio.com>
- */
-
-#include "config.h"
-#include "empathy-time.h"
-
-#include <glib/gi18n-lib.h>
-
-/* Note: EmpathyTime is always in UTC. */
-
-gint64
-empathy_time_get_current (void)
-{
-  GDateTime *now;
-  gint64 result;
-
-  now = g_date_time_new_now_utc ();
-  result = g_date_time_to_unix (now);
-  g_date_time_unref (now);
-
-  return result;
-}
-
-/* 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)
-{
-  GDateTime *d;
-  char *result;
-
-  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);
-
-  return result;
-}
-
-/* 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)
-{
-  GDateTime *d, *local;
-  gchar *result;
-
-  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);
-
-  result = g_date_time_format (local, format);
-  g_date_time_unref (local);
-
-  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);
-    }
-}
-
-gchar  *
-empathy_time_to_string_relative (gint64 t)
-{
-  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);
-
-  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"));
-
-  g_date_time_unref (now);
-  g_date_time_unref (then);
-
-  return result;
-}
diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
deleted file mode 100644
index fc7af28e3..000000000
--- a/libempathy/empathy-time.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2004 Imendio AB
- * 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
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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
- * Lesser General Public License for more details.
- *
- * 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__
-#define __EMPATHY_TIME_H__
-
-#ifndef __USE_XOPEN
-#define __USE_XOPEN
-#endif
-#include <time.h>
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* 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
-
-#endif /* __EMPATHY_TIME_H__ */
-