#include "empathy-contactinfo-utils.h"
#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-time.h>
#include "empathy-request-util.h"
#include "empathy-string-parser.h"
-#include "empathy-time.h"
#include "empathy-ui-utils.h"
static gchar *
if (duration <= 0)
return NULL;
- return empathy_duration_to_string (duration);
+ return tpaw_duration_to_string (duration);
}
static gchar *
#include <glib/gi18n-lib.h>
#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-time.h>
#ifdef HAVE_LIBCHAMPLAIN
#include <champlain/champlain.h>
#include "empathy-groups-widget.h"
#include "empathy-gtk-enum-types.h"
#include "empathy-location.h"
-#include "empathy-time.h"
#include "empathy-ui-utils.h"
#include "empathy-utils.h"
stamp = g_value_get_int64 (value);
- user_date = empathy_time_to_string_relative (stamp);
+ user_date = tpaw_time_to_string_relative (stamp);
tmp = g_strdup_printf ("<b>%s</b>", _("Location"));
/* translators: format is "Location, $date" */
gint64 time_;
time_ = g_value_get_int64 (value);
- svalue = empathy_time_to_string_utc (time_, _("%B %e, %Y at %R UTC"));
+ svalue = tpaw_time_to_string_utc (time_, _("%B %e, %Y at %R UTC"));
}
if (svalue != NULL)
#include "empathy-location-manager.h"
#include <geoclue/geoclue-master.h>
+#include <tp-account-widgets/tpaw-time.h>
#include "empathy-gsettings.h"
#include "empathy-location.h"
-#include "empathy-time.h"
#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
#include "empathy-debug.h"
{
gint64 timestamp;
- timestamp = empathy_time_get_current ();
+ timestamp = tpaw_time_get_current ();
tp_asv_set_int64 (self->priv->location, EMPATHY_LOCATION_TIMESTAMP,
timestamp);
#include "empathy-theme-adium.h"
#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-time.h>
#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-gsettings.h"
#include "empathy-images.h"
#include "empathy-plist.h"
#include "empathy-smiley-manager.h"
-#include "empathy-time.h"
#include "empathy-ui-utils.h"
#include "empathy-utils.h"
#include "empathy-webkit-utils.h"
strftime_format = nsdate_to_strftime (self->priv->data, format);
if (is_backlog)
- dup_replace = empathy_time_to_string_local (timestamp,
+ dup_replace = tpaw_time_to_string_local (timestamp,
strftime_format ? strftime_format :
- EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT);
+ TPAW_TIME_DATE_FORMAT_DISPLAY_SHORT);
else
- dup_replace = empathy_time_to_string_local (timestamp,
+ dup_replace = tpaw_time_to_string_local (timestamp,
strftime_format ? strftime_format :
- EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
+ TPAW_TIME_FORMAT_DISPLAY_SHORT);
replace = dup_replace;
}
else if (theme_adium_match (&cur, "%shortTime%"))
{
- dup_replace = empathy_time_to_string_local (timestamp,
- EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
+ dup_replace = tpaw_time_to_string_local (timestamp,
+ TPAW_TIME_FORMAT_DISPLAY_SHORT);
replace = dup_replace;
}
else if (theme_adium_match (&cur, "%service%"))
{
theme_adium_add_html (self, "appendMessage",
self->priv->data->status_html, escaped, NULL, NULL, NULL,
- NULL, "event", empathy_time_get_current (), FALSE, FALSE, direction);
+ NULL, "event", tpaw_time_get_current (), FALSE, FALSE, direction);
/* There is no last contact */
if (self->priv->last_contact)
}
/* set a tooltip */
- timestamp = empathy_time_to_string_local (
+ timestamp = tpaw_time_to_string_local (
empathy_message_get_timestamp (message),
"%H:%M:%S");
tooltip = g_strdup_printf (_("Message edited at %s"), timestamp);
#include "empathy-user-info.h"
#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-time.h>
#include "empathy-avatar-chooser.h"
#include "empathy-calendar-button.h"
#include "empathy-contactinfo-utils.h"
-#include "empathy-time.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
{
gchar tmp[255];
- g_date_strftime (tmp, sizeof (tmp), EMPATHY_DATE_FORMAT_DISPLAY_SHORT,
+ g_date_strftime (tmp, sizeof (tmp), TPAW_DATE_FORMAT_DISPLAY_SHORT,
date);
strv[0] = tmp;
}
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 \
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
#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
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)
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);
}
#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"
EMPATHY_TYPE_MESSAGE, EmpathyMessagePriv);
message->priv = priv;
- priv->timestamp = empathy_time_get_current ();
+ priv->timestamp = tpaw_time_get_current ();
}
static void
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);
+++ /dev/null
-/*
- * 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;
-}
+++ /dev/null
-/*
- * 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__ */
-
tpaw-irc-network.c \
tpaw-irc-server.c \
tpaw-live-search.c \
+ tpaw-time.c \
tpaw-utils.c \
totem-subtitle-encoding.c \
$(NULL)
tpaw-irc-network.h \
tpaw-irc-server.h \
tpaw-live-search.h \
+ tpaw-time.h \
tpaw-utils.h \
totem-subtitle-encoding.h \
$(NULL)
--- /dev/null
+/*
+ * 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 "tpaw-time.h"
+
+#include <glib/gi18n-lib.h>
+
+/* Note: TpawTime is always in UTC. */
+
+gint64
+tpaw_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 *
+tpaw_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 *
+tpaw_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 *
+tpaw_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 *
+tpaw_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 = tpaw_duration_to_string (seconds);
+ else
+ result = g_strdup (_("in the future"));
+
+ g_date_time_unref (now);
+ g_date_time_unref (then);
+
+ return result;
+}
--- /dev/null
+/*
+ * 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 __TPAW_TIME_H__
+#define __TPAW_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 TPAW_TIME_FORMAT_DISPLAY_SHORT "%X"
+#define TPAW_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y"
+#define TPAW_TIME_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y, %X"
+
+gint64 tpaw_time_get_current (void);
+gchar *tpaw_time_to_string_utc (gint64 t,
+ const gchar *format);
+gchar *tpaw_time_to_string_local (gint64 t,
+ const gchar *format);
+gchar *tpaw_time_to_string_relative (gint64 t);
+gchar *tpaw_duration_to_string (guint seconds);
+
+G_END_DECLS
+
+#endif /* __TPAW_TIME_H__ */
+