Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'warnings' into 'master'
Fix various glib deprecation warnings

See merge request mer-core/libgsupplicant!9
  • Loading branch information
monich committed May 13, 2020
2 parents 138d871 + 9840b1d commit be3cf65
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 17 deletions.
10 changes: 5 additions & 5 deletions include/gsupplicant_interface.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015-2018 Jolla Ltd.
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2015-2020 Jolla Ltd.
* Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
Expand All @@ -14,8 +14,8 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the names of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Expand Down Expand Up @@ -487,7 +487,7 @@ gsupplicant_interface_add_eap_status_handler(
GSupplicantInterfaceEapStatusFunc fn,
void* data); /* Since: 1.0.17 */

G_INLINE_FUNC const char*
GSUPPLICANT_INLINE const char*
gsupplicant_interface_get_state_name(GSupplicantInterface* iface)
{ return iface ? gsupplicant_interface_state_name(iface->state) : NULL; }

Expand Down
10 changes: 6 additions & 4 deletions src/gsupplicant_bss.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015-2018 Jolla Ltd.
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2015-2020 Jolla Ltd.
* Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
Expand All @@ -14,8 +14,8 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the names of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Expand All @@ -30,6 +30,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/

#define GLIB_DISABLE_DEPRECATION_WARNINGS /* G_ADD_PRIVATE */

#include "gsupplicant_bss.h"
#include "gsupplicant_interface.h"
#include "gsupplicant_util_p.h"
Expand Down
10 changes: 6 additions & 4 deletions src/gsupplicant_interface.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015-2018 Jolla Ltd.
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2015-2020 Jolla Ltd.
* Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
Expand All @@ -14,8 +14,8 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the names of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Expand All @@ -30,6 +30,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/

#define GLIB_DISABLE_DEPRECATION_WARNINGS /* G_ADD_PRIVATE */

#include "gsupplicant_interface.h"
#include "gsupplicant_network.h"
#include "gsupplicant_bss.h"
Expand Down
10 changes: 6 additions & 4 deletions src/gsupplicant_network.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2015-2018 Jolla Ltd.
* Copyright (C) 2015-2018 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2015-2020 Jolla Ltd.
* Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
Expand All @@ -14,8 +14,8 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the names of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Expand All @@ -30,6 +30,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/

#define GLIB_DISABLE_DEPRECATION_WARNINGS /* G_ADD_PRIVATE */

#include "gsupplicant_network.h"
#include "gsupplicant_interface.h"
#include "gsupplicant_dbus.h"
Expand Down

0 comments on commit be3cf65

Please sign in to comment.