
Previously, src/nm-ip4-config.h, libnm/nm-ip4-config.h, and libnm-glib/nm-ip4-config.h all used "NM_IP4_CONFIG_H" as an include guard, which meant that nm-test-utils.h could not tell which of them was being included (and so, eg, if you tried to include nm-ip4-config.h in a libnm test, it would fail to compile because nm-test-utils.h was referring to symbols in src/nm-ip4-config.h). Fix this by changing the include guards in the non-API-stable parts of the tree: - libnm-glib/nm-ip4-config.h remains NM_IP4_CONFIG_H - libnm/nm-ip4-config.h now uses __NM_IP4_CONFIG_H__ - src/nm-ip4-config.h now uses __NETWORKMANAGER_IP4_CONFIG_H__ And likewise for all other headers. The two non-"nm"-prefixed headers, libnm/NetworkManager.h and src/NetworkManagerUtils.h are now __NETWORKMANAGER_H__ and __NETWORKMANAGER_UTILS_H__ respectively, which, while not entirely consistent with the general scheme, do still mostly make sense in isolation.
94 lines
3.4 KiB
C
94 lines
3.4 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 2008 - 2011 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_OBJECT_PRIVATE_H__
|
|
#define __NM_OBJECT_PRIVATE_H__
|
|
|
|
#include <gio/gio.h>
|
|
#include "nm-object.h"
|
|
|
|
typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GValue *, gpointer);
|
|
|
|
typedef GObject * (*NMObjectCreatorFunc) (DBusGConnection *, const char *);
|
|
|
|
typedef struct {
|
|
const char *name;
|
|
gpointer field;
|
|
PropertyMarshalFunc func;
|
|
GType object_type;
|
|
const char *signal_prefix;
|
|
} NMPropertiesInfo;
|
|
|
|
DBusGProxy *_nm_object_new_proxy (NMObject *self,
|
|
const char *path,
|
|
const char *interface);
|
|
|
|
gboolean _nm_object_is_connection_private (NMObject *self);
|
|
|
|
void _nm_object_register_properties (NMObject *object,
|
|
DBusGProxy *proxy,
|
|
const NMPropertiesInfo *info);
|
|
|
|
gboolean _nm_object_reload_properties (NMObject *object, GError **error);
|
|
|
|
void _nm_object_reload_properties_async (NMObject *object,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data);
|
|
gboolean _nm_object_reload_properties_finish (NMObject *object,
|
|
GAsyncResult *result,
|
|
GError **error);
|
|
|
|
void _nm_object_queue_notify (NMObject *object, const char *property);
|
|
|
|
void _nm_object_suppress_property_updates (NMObject *object, gboolean suppress);
|
|
|
|
/* DBus property accessors */
|
|
|
|
void _nm_object_reload_property (NMObject *object,
|
|
const char *interface,
|
|
const char *prop_name);
|
|
|
|
void _nm_object_set_property (NMObject *object,
|
|
const char *interface,
|
|
const char *prop_name,
|
|
GValue *value);
|
|
|
|
static inline const GPtrArray *
|
|
handle_ptr_array_return (GPtrArray *array)
|
|
{
|
|
/* zero-length is special-case; return NULL */
|
|
if (!array || !array->len)
|
|
return NULL;
|
|
return array;
|
|
}
|
|
|
|
/* object demarshalling support */
|
|
typedef GType (*NMObjectTypeFunc) (DBusGConnection *, const char *);
|
|
typedef void (*NMObjectTypeCallbackFunc) (GType, gpointer);
|
|
typedef void (*NMObjectTypeAsyncFunc) (DBusGConnection *, const char *, NMObjectTypeCallbackFunc, gpointer);
|
|
|
|
void _nm_object_register_type_func (GType base_type, NMObjectTypeFunc type_func,
|
|
NMObjectTypeAsyncFunc type_async_func);
|
|
|
|
#define NM_OBJECT_NM_RUNNING "nm-running-internal"
|
|
gboolean _nm_object_get_nm_running (NMObject *self);
|
|
|
|
#endif /* __NM_OBJECT_PRIVATE_H__ */
|