[mms-engine] Fixed GLib deprecation warnings

sailfishos · Jul 8, 2020 · 3a7213a · 3a7213a
1 parent d6e043f
commit 3a7213a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git 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 <slava.monich@jolla.com>
+ * Copyright (C) 2013-2020 Jolla Ltd.
+ * Copyright (C) 2013-2020 Slava Monich <slava.monich@jolla.com>
  *
  * 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
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2013-2017 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2013-2020 Jolla Ltd.
+ * Copyright (C) 2013-2020 Slava Monich <slava.monich@jolla.com>
  *
  * 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
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2013-2015 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2013-2020 Jolla Ltd.
+ * Copyright (C) 2013-2020 Slava Monich <slava.monich@jolla.com>
  *
  * 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
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016-2019 Jolla Ltd.
- * Copyright (C) 2016-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2020 Jolla Ltd.
+ * Copyright (C) 2016-2020 Slava Monich <slava.monich@jolla.com>
  * 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"