aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-contactinfo-utils.c4
-rw-r--r--libempathy-gtk/empathy-individual-widget.c6
-rw-r--r--libempathy-gtk/empathy-location-manager.c4
-rw-r--r--libempathy-gtk/empathy-theme-adium.c18
-rw-r--r--libempathy-gtk/empathy-user-info.c4
5 files changed, 18 insertions, 18 deletions
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index 38f64375a..42d03806d 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -24,10 +24,10 @@
#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 *
@@ -45,7 +45,7 @@ format_idle_time (GStrv values)
if (duration <= 0)
return NULL;
- return empathy_duration_to_string (duration);
+ return tpaw_duration_to_string (duration);
}
static gchar *
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index e24aeadab..bf0998ece 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -24,6 +24,7 @@
#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>
@@ -35,7 +36,6 @@
#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"
@@ -594,7 +594,7 @@ location_update (EmpathyIndividualWidget *self)
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" */
@@ -647,7 +647,7 @@ location_update (EmpathyIndividualWidget *self)
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)
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 3a97c94cf..8216cf315 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -23,10 +23,10 @@
#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"
@@ -244,7 +244,7 @@ update_timestamp (EmpathyLocationManager *self)
{
gint64 timestamp;
- timestamp = empathy_time_get_current ();
+ timestamp = tpaw_time_get_current ();
tp_asv_set_int64 (self->priv->location, EMPATHY_LOCATION_TIMESTAMP,
timestamp);
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index d5b935681..05b166180 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -23,13 +23,13 @@
#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"
@@ -648,20 +648,20 @@ theme_adium_add_html (EmpathyThemeAdium *self,
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%"))
@@ -746,7 +746,7 @@ theme_adium_append_event_escaped (EmpathyThemeAdium *self,
{
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)
@@ -1206,7 +1206,7 @@ empathy_theme_adium_edit_message (EmpathyThemeAdium *self,
}
/* 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);
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index a814c1545..dbb6e084c 100644
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -21,11 +21,11 @@
#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
@@ -93,7 +93,7 @@ bday_changed_cb (EmpathyCalendarButton *button,
{
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;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 18:17:35 +0800