mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-09 12:00:36 +01:00
e0bded93f3
When merely including "nm-vpn-plugin-info.h" (or "NetworkManager.h")
gcc raises warnings like:
"Not available before 1.2 [-Werror=deprecated-declarations]"
The problem is that the NMVpnPluginInfo typedef itself is marked as
deprecated but also used by other functions like nm_vpn_plugin_info_get_name().
typedef struct {
int field;
} Foo G_UNAVAILABLE(1,2);
G_UNAVAILABLE(1,2)
void deprecated_function (Foo *foo);
warning: ‘Foo’ is deprecated: Not available before 1.2 [-Wdeprecated-declarations]
I think that when a function is itself deprecated, gcc should not warn about
the use of a deprecated typedef.
Gcc's documentation states: "Note that the warnings only occur for
uses and then only if the type is being applied to an identifier
that itself is not being declared as deprecated.".
Apparently, this only works for structs, but not for typedef of structs.
Anyway. Remove the deprecation from NMVpnPluginInfo to avoid the compiler
warning.
https://bugzilla.gnome.org/show_bug.cgi?id=753098
Fixes: d6226bd987
114 lines
4.5 KiB
C
114 lines
4.5 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright 2015 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_VPN_PLUGIN_INFO_H__
|
|
#define __NM_VPN_PLUGIN_INFO_H__
|
|
|
|
#include <glib.h>
|
|
#include <glib-object.h>
|
|
|
|
#include "nm-utils.h"
|
|
#include "nm-vpn-editor-plugin.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_VPN_PLUGIN_INFO (nm_vpn_plugin_info_get_type ())
|
|
#define NM_VPN_PLUGIN_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN_INFO, NMVpnPluginInfo))
|
|
#define NM_VPN_PLUGIN_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_PLUGIN_INFO, NMVpnPluginInfoClass))
|
|
#define NM_IS_VPN_PLUGIN_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN_INFO))
|
|
#define NM_IS_VPN_PLUGIN_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_PLUGIN_INFO))
|
|
#define NM_VPN_PLUGIN_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_PLUGIN_INFO, NMVpnPluginInfoClass))
|
|
|
|
#define NM_VPN_PLUGIN_INFO_NAME "name"
|
|
#define NM_VPN_PLUGIN_INFO_FILENAME "filename"
|
|
#define NM_VPN_PLUGIN_INFO_KEYFILE "keyfile"
|
|
|
|
#define NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION "VPN Connection"
|
|
#define NM_VPN_PLUGIN_INFO_KF_GROUP_LIBNM "libnm"
|
|
#define NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME "GNOME"
|
|
|
|
typedef struct {
|
|
NM_AVAILABLE_IN_1_2
|
|
GObject parent;
|
|
} NMVpnPluginInfo;
|
|
|
|
typedef struct {
|
|
NM_AVAILABLE_IN_1_2
|
|
GObjectClass parent;
|
|
|
|
/*< private >*/
|
|
NM_AVAILABLE_IN_1_2
|
|
gpointer padding[8];
|
|
} NMVpnPluginInfoClass NM_AVAILABLE_IN_1_2;
|
|
|
|
NM_AVAILABLE_IN_1_2
|
|
GType nm_vpn_plugin_info_get_type (void);
|
|
|
|
NM_AVAILABLE_IN_1_2
|
|
NMVpnPluginInfo *nm_vpn_plugin_info_new_from_file (const char *filename,
|
|
GError **error);
|
|
|
|
NM_AVAILABLE_IN_1_2
|
|
NMVpnPluginInfo *nm_vpn_plugin_info_new_with_data (const char *filename,
|
|
GKeyFile *keyfile,
|
|
GError **error);
|
|
|
|
NM_AVAILABLE_IN_1_2
|
|
const char *nm_vpn_plugin_info_get_name (NMVpnPluginInfo *self);
|
|
NM_AVAILABLE_IN_1_2
|
|
const char *nm_vpn_plugin_info_get_filename (NMVpnPluginInfo *self);
|
|
NM_AVAILABLE_IN_1_2
|
|
const char *nm_vpn_plugin_info_get_service (NMVpnPluginInfo *self);
|
|
NM_AVAILABLE_IN_1_2
|
|
const char *nm_vpn_plugin_info_get_plugin (NMVpnPluginInfo *self);
|
|
NM_AVAILABLE_IN_1_2
|
|
const char *nm_vpn_plugin_info_get_program (NMVpnPluginInfo *self);
|
|
NM_AVAILABLE_IN_1_2
|
|
const char *nm_vpn_plugin_info_lookup_property (NMVpnPluginInfo *self, const char *group, const char *key);
|
|
|
|
NM_AVAILABLE_IN_1_2
|
|
gboolean nm_vpn_plugin_info_validate_filename (const char *filename);
|
|
|
|
NM_AVAILABLE_IN_1_2
|
|
GSList *nm_vpn_plugin_info_list_load (void);
|
|
NM_AVAILABLE_IN_1_2
|
|
gboolean nm_vpn_plugin_info_list_add (GSList **list, NMVpnPluginInfo *plugin_info, GError **error);
|
|
NM_AVAILABLE_IN_1_2
|
|
gboolean nm_vpn_plugin_info_list_remove (GSList **list, NMVpnPluginInfo *plugin_info);
|
|
NM_AVAILABLE_IN_1_2
|
|
NMVpnPluginInfo *nm_vpn_plugin_info_list_find_by_name (GSList *list, const char *name);
|
|
NM_AVAILABLE_IN_1_2
|
|
NMVpnPluginInfo *nm_vpn_plugin_info_list_find_by_filename (GSList *list, const char *filename);
|
|
NM_AVAILABLE_IN_1_2
|
|
NMVpnPluginInfo *nm_vpn_plugin_info_list_find_by_service (GSList *list, const char *service);
|
|
|
|
|
|
NM_AVAILABLE_IN_1_2
|
|
NMVpnEditorPlugin *nm_vpn_plugin_info_get_editor_plugin (NMVpnPluginInfo *self);
|
|
NM_AVAILABLE_IN_1_2
|
|
void nm_vpn_plugin_info_set_editor_plugin (NMVpnPluginInfo *self,
|
|
NMVpnEditorPlugin *plugin);
|
|
NM_AVAILABLE_IN_1_2
|
|
NMVpnEditorPlugin *nm_vpn_plugin_info_load_editor_plugin (NMVpnPluginInfo *self,
|
|
GError **error);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __NM_VPN_PLUGIN_INFO_H__ */
|