diff options
author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-29 16:32:09 +0800 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:05 +0800 |
commit | 59d0c113fdf2e565f512c98334a1808cfd216fa9 (patch) | |
tree | 6298463ab4aa96a3ad12448387e4e0edc97089df /libempathy-gtk/empathy-theme-adium.c | |
parent | 1f633bf20747995395b1dcc7001e0c9502104eda (diff) | |
download | gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.gz gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.bz2 gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.lz gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.xz gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.zst gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.zip |
time: move from Empathy to tp-account-widgets
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
-rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 18 |
1 files changed, 9 insertions, 9 deletions
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); |