pidgin/pidgin

Move purple_compat_date_time_format_iso8601 to just be a static inline with its normal glib name

2021-04-30, Gary Kramlich
32a19e77cfa3
Parents 82e45cd837fa
Children 73e647dfbb68
Move purple_compat_date_time_format_iso8601 to just be a static inline with its normal glib name

Testing Done:
Compiled and ran locally. Also ran `ninja pidgin-pot libpurple-doc`

Reviewed at https://reviews.imfreedom.org/r/633/
4 files changed, 25 insertions(+), 54 deletions(-)
  • +0 -50
    libpurple/glibcompat.c
  • +25 -2
    libpurple/glibcompat.h
  • +0 -1
    libpurple/meson.build
  • +0 -1
    po/POTFILES.in
    • --- 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
    - *
    - * 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
    - * source distribution.
    - *
    - * 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/>.
    - */
    -
    -#include "glibcompat.h"
    -
    -#if !GLIB_CHECK_VERSION(2, 62, 0)
    -gchar *
    -purple_compat_date_time_format_iso8601(GDateTime *datetime) {
    - GString *outstr = NULL;
    - gchar *main_date = NULL;
    - gint64 offset;
    -
    - /* Main date and time. */
    - main_date = g_date_time_format(datetime, "%Y-%m-%dT%H:%M:%S");
    - outstr = g_string_new(main_date);
    - g_free(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);
    -
    - if (offset == 0) {
    - g_string_append_c(outstr, 'Z');
    - } else {
    - gchar *time_zone = g_date_time_format(datetime, "%:::z");
    - g_string_append(outstr, time_zone);
    - g_free(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);
    +static inline gchar *
    +g_date_time_format_iso8601(GDateTime *datetime) {
    + GString *outstr = NULL;
    + gchar *main_date = NULL;
    + gint64 offset;
    +
    + /* Main date and time. */
    + main_date = g_date_time_format(datetime, "%Y-%m-%dT%H:%M:%S");
    + outstr = g_string_new(main_date);
    + g_free(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);
    +
    + if (offset == 0) {
    + g_string_append_c(outstr, 'Z');
    + } else {
    + gchar *time_zone = g_date_time_format(datetime, "%:::z");
    + g_string_append(outstr, time_zone);
    + g_free(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 @@
    'countingnode.c',
    'debug.c',
    'eventloop.c',
    - 'glibcompat.c',
    'group.c',
    'idle.c',
    'image.c',
    --- 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/debug.c
    libpurple/eventloop.c
    libpurple/example/nullclient.c
    -libpurple/glibcompat.c
    libpurple/group.c
    libpurple/idle.c
    libpurple/image.c