--- a/libpurple/glibcompat.c Wed Apr 21 18:45:53 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
- * Pidgin is the legal property of its developers, whose names are too numerous
- * to list here. Please refer to the COPYRIGHT file distributed with this
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * This program 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 General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <https://www.gnu.org/licenses/>.
-#if !GLIB_CHECK_VERSION(2, 62, 0)
-purple_compat_date_time_format_iso8601(GDateTime *datetime) {
- GString *outstr = NULL;
- gchar *main_date = NULL;
- /* Main date and time. */
- main_date = g_date_time_format(datetime, "%Y-%m-%dT%H:%M:%S");
- outstr = g_string_new(main_date);
- /* Timezone. Format it as `%:::z` unless the offset is zero, in which case
- * we can simply use `Z`. */
- offset = g_date_time_get_utc_offset(datetime);
- g_string_append_c(outstr, 'Z');
- gchar *time_zone = g_date_time_format(datetime, "%:::z");
- g_string_append(outstr, time_zone);
- return g_string_free(outstr, FALSE);
-#endif /* !GLIB_CHECK_VERSION(2, 62, 0) */
--- a/libpurple/glibcompat.h Wed Apr 21 18:45:53 2021 -0500
+++ b/libpurple/glibcompat.h Fri Apr 30 04:51:11 2021 -0500
@@ -78,8 +78,31 @@
#endif /* !GLIB_CHECK_VERSION(2, 58, 0) */
#if !GLIB_CHECK_VERSION(2, 62, 0)
-#define g_date_time_format_iso8601(dt) (purple_compat_date_time_format_iso8601((dt)))
-gchar *purple_compat_date_time_format_iso8601(GDateTime *datetime);
+g_date_time_format_iso8601(GDateTime *datetime) { + GString *outstr = NULL; + gchar *main_date = NULL; + /* Main date and time. */ + main_date = g_date_time_format(datetime, "%Y-%m-%dT%H:%M:%S"); + outstr = g_string_new(main_date); + /* Timezone. Format it as `%:::z` unless the offset is zero, in which case + * we can simply use `Z`. */ + offset = g_date_time_get_utc_offset(datetime); + g_string_append_c(outstr, 'Z'); + gchar *time_zone = g_date_time_format(datetime, "%:::z"); + g_string_append(outstr, time_zone); + return g_string_free(outstr, FALSE); #endif /* GLIB_CHECK_VERSION(2, 62, 0) */
/* Backport the static inline version of g_memdup2 if we don't have g_memdup2.
--- a/libpurple/meson.build Wed Apr 21 18:45:53 2021 -0500
+++ b/libpurple/meson.build Fri Apr 30 04:51:11 2021 -0500
@@ -16,7 +16,6 @@
--- a/po/POTFILES.in Wed Apr 21 18:45:53 2021 -0500
+++ b/po/POTFILES.in Fri Apr 30 04:51:11 2021 -0500
@@ -41,7 +41,6 @@
libpurple/example/nullclient.c