From 7f5169c2e963a1c3a3508a0a368e5cf48ab832f7 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 30 Sep 2020 19:41:18 +0200 Subject: [PATCH] Use g_date_time_format_iso8601() This partly reverts d3a387a0ec6e5265f625de87318be2de610efb01. For proanity 0.9.x we still wanted to support older glib versions so that we can be packaged for various linux distros. Now with 0.10 we want to move on. --- configure.ac | 4 ++-- src/database.c | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 7ccf9964..fa5838ed 100644 --- a/configure.ac +++ b/configure.ac @@ -186,8 +186,8 @@ AS_IF([test "x$ncurses_cv_wget_wch" != xyes], [AC_MSG_ERROR([ncurses does not support wide characters])]) ### Check for glib libraries -PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.56.0], [], - [AC_MSG_ERROR([glib 2.56.0 or higher is required for profanity])]) +PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.62.0], [], + [AC_MSG_ERROR([glib 2.62.0 or higher is required for profanity])]) PKG_CHECK_MODULES([gio], [gio-2.0], [], [AC_MSG_ERROR([libgio-2.0 from glib-2.0 is required for profanity])]) diff --git a/src/database.c b/src/database.c index 8424b398..37fe5a03 100644 --- a/src/database.c +++ b/src/database.c @@ -316,15 +316,9 @@ _add_to_db(ProfMessage* message, char* type, const Jid* const from_jid, const Ji gchar* date_fmt; if (message->timestamp) { - // g_date_time_format_iso8601() is only availble from glib 2.62 on. - // To still support Debian buster lets use g_date_time_format() for now. - //date_fmt = g_date_time_format_iso8601(message->timestamp); - date_fmt = g_date_time_format(message->timestamp, "%FT%T%:::z"); + date_fmt = g_date_time_format_iso8601(message->timestamp); } else { - // g_date_time_format_iso8601() is only availble from glib 2.62 on. - // To still support Debian buster lets use g_date_time_format() for now. - //date_fmt = g_date_time_format_iso8601(g_date_time_new_now_local()); - date_fmt = g_date_time_format(g_date_time_new_now_local(), "%FT%T%:::z"); + date_fmt = g_date_time_format_iso8601(g_date_time_new_now_local()); } const char* enc = _get_message_enc_str(message->enc);