From 3a7213a5d0d70e2aa0be4b8ebf0312341ed50844 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Tue, 7 Jul 2020 16:43:32 +0300 Subject: [PATCH] [mms-engine] Fixed GLib deprecation warnings --- mms-lib/src/mms_task.c | 6 ++++-- mms-lib/src/mms_task_http.c | 6 ++++-- mms-lib/src/mms_util.h | 6 +++--- mms-transfer-list-dbus/src/mms_transfer_dbus.c | 6 ++++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/mms-lib/src/mms_task.c b/mms-lib/src/mms_task.c index a058b7b..0f1969c 100644 --- a/mms-lib/src/mms_task.c +++ b/mms-lib/src/mms_task.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2013-2016 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2013-2020 Jolla Ltd. + * Copyright (C) 2013-2020 Slava Monich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -12,6 +12,8 @@ * GNU General Public License for more details. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include "mms_task.h" #include "mms_handler.h" #include "mms_file_util.h" diff --git a/mms-lib/src/mms_task_http.c b/mms-lib/src/mms_task_http.c index 64c0fad..65472bc 100644 --- a/mms-lib/src/mms_task_http.c +++ b/mms-lib/src/mms_task_http.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2013-2017 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2013-2020 Jolla Ltd. + * Copyright (C) 2013-2020 Slava Monich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -12,6 +12,8 @@ * GNU General Public License for more details. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include "mms_task_http.h" #include "mms_connection.h" #include "mms_settings.h" diff --git a/mms-lib/src/mms_util.h b/mms-lib/src/mms_util.h index f992364..5d9726c 100644 --- a/mms-lib/src/mms_util.h +++ b/mms-lib/src/mms_util.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2013-2015 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2013-2020 Jolla Ltd. + * Copyright (C) 2013-2020 Slava Monich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -35,7 +35,7 @@ mms_decode_bytes( GBytes* bytes); /* NULL-resistant variant of g_strstrip */ -G_INLINE_FUNC char* mms_strip(char* str) +static inline char* mms_strip(char* str) { return str ? g_strstrip(str) : NULL; } /* Address type suffices */ diff --git a/mms-transfer-list-dbus/src/mms_transfer_dbus.c b/mms-transfer-list-dbus/src/mms_transfer_dbus.c index 7fe47a3..8fd790f 100644 --- a/mms-transfer-list-dbus/src/mms_transfer_dbus.c +++ b/mms-transfer-list-dbus/src/mms_transfer_dbus.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2016-2019 Jolla Ltd. - * Copyright (C) 2016-2019 Slava Monich + * Copyright (C) 2016-2020 Jolla Ltd. + * Copyright (C) 2016-2020 Slava Monich * Copyright (C) 2019 Open Mobile Platform LLC. * * This program is free software; you can redistribute it and/or modify @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#define GLIB_DISABLE_DEPRECATION_WARNINGS + #include "mms_transfer_dbus.h" #include "mms_transfer_list_dbus_log.h"