From 6179667d3d1aaba19e7a0fb1189a253d12f7cda8 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 13 Dec 2022 18:14:51 +0100 Subject: libmm-glib,common-helpers: avoid using g_time_zone_new_offset() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It requires newer glib than we do: ../libmm-glib/mm-common-helpers.c: In function ‘mm_new_iso8601_time’: ../libmm-glib/mm-common-helpers.c:1787:9: warning: ‘g_time_zone_new_offset’ is deprecated: Not available before 2.58 [-Wdeprecated-declarations] 1787 | tz = g_time_zone_new_offset (offset_minutes * 60); | ^~ In file included from /usr/include/glib-2.0/glib/gdatetime.h:33: /usr/include/glib-2.0/glib/gtimezone.h:67:25: note: declared here 67 | GTimeZone * g_time_zone_new_offset (gint32 seconds); | ^~~~~~~~~~~~~~~~~~~~~~ Let's not use the routine with older versions of glib. --- libmm-glib/mm-common-helpers.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libmm-glib') diff --git a/libmm-glib/mm-common-helpers.c b/libmm-glib/mm-common-helpers.c index de49136d..b57cb205 100644 --- a/libmm-glib/mm-common-helpers.c +++ b/libmm-glib/mm-common-helpers.c @@ -1783,8 +1783,20 @@ mm_new_iso8601_time (guint year, if (have_offset) { g_autoptr(GTimeZone) tz = NULL; - +#if GLIB_CHECK_VERSION (2, 58, 0) + G_GNUC_BEGIN_IGNORE_DEPRECATIONS tz = g_time_zone_new_offset (offset_minutes * 60); + G_GNUC_END_IGNORE_DEPRECATIONS +#else + g_autofree gchar *identifier = NULL; + + identifier = g_strdup_printf ("%c%02u:%02u:00", + (offset_minutes >= 0) ? '+' : '-', + ABS (offset_minutes) / 60, + ABS (offset_minutes) % 60); + + tz = g_time_zone_new (identifier); +#endif dt = g_date_time_new (tz, year, month, day, hour, minute, second); } else dt = g_date_time_new_utc (year, month, day, hour, minute, second); -- cgit v1.2.3-70-g09d2