7a0e347b38
libnm/tests/test-general statically links against libnm/libnm-utils.la and dynamically against libnm/libnm.so. Hence, _nm_utils_init() is invoked twice, failing the assertion. That is a bug that must be fixed. For now, just don't assert.
81 lines
3.1 KiB
C
81 lines
3.1 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 2004 - 2014 Red Hat, Inc.
|
|
*/
|
|
|
|
#include "nm-default.h"
|
|
|
|
#include "nm-errors.h"
|
|
|
|
#include "nm-vpn-dbus-interface.h"
|
|
#include "nm-core-internal.h"
|
|
|
|
NM_CACHED_QUARK_FCN ("nm-agent-manager-error-quark", nm_agent_manager_error_quark)
|
|
NM_CACHED_QUARK_FCN ("nm-connection-error-quark", nm_connection_error_quark)
|
|
NM_CACHED_QUARK_FCN ("nm-crypto-error-quark", nm_crypto_error_quark)
|
|
NM_CACHED_QUARK_FCN ("nm-device-error-quark", nm_device_error_quark)
|
|
NM_CACHED_QUARK_FCN ("nm-manager-error-quark", nm_manager_error_quark)
|
|
NM_CACHED_QUARK_FCN ("nm-secret-agent-error-quark", nm_secret_agent_error_quark)
|
|
NM_CACHED_QUARK_FCN ("nm-settings-error-quark", nm_settings_error_quark)
|
|
NM_CACHED_QUARK_FCN ("nm-vpn-plugin-error-quark", nm_vpn_plugin_error_quark)
|
|
|
|
static void
|
|
register_error_domain (GQuark domain,
|
|
const char *interface,
|
|
GType enum_type)
|
|
{
|
|
nm_auto_unref_gtypeclass GEnumClass *enum_class = g_type_class_ref (enum_type);
|
|
guint i;
|
|
|
|
for (i = 0; i < enum_class->n_values; i++) {
|
|
const GEnumValue *e = &enum_class->values[i];
|
|
char error_name[200];
|
|
|
|
nm_assert (e && e->value_nick && !strchr (e->value_nick, '-'));
|
|
|
|
nm_sprintf_buf (error_name, "%s.%s", interface, e->value_nick);
|
|
g_dbus_error_register_error (domain, e->value, error_name);
|
|
}
|
|
}
|
|
|
|
void
|
|
_nm_dbus_errors_init (void)
|
|
{
|
|
register_error_domain (NM_AGENT_MANAGER_ERROR,
|
|
NM_DBUS_INTERFACE_AGENT_MANAGER,
|
|
NM_TYPE_AGENT_MANAGER_ERROR);
|
|
register_error_domain (NM_CONNECTION_ERROR,
|
|
NM_DBUS_INTERFACE_SETTINGS_CONNECTION,
|
|
NM_TYPE_CONNECTION_ERROR);
|
|
register_error_domain (NM_DEVICE_ERROR,
|
|
NM_DBUS_INTERFACE_DEVICE,
|
|
NM_TYPE_DEVICE_ERROR);
|
|
register_error_domain (NM_MANAGER_ERROR,
|
|
NM_DBUS_INTERFACE,
|
|
NM_TYPE_MANAGER_ERROR);
|
|
register_error_domain (NM_SECRET_AGENT_ERROR,
|
|
NM_DBUS_INTERFACE_SECRET_AGENT,
|
|
NM_TYPE_SECRET_AGENT_ERROR);
|
|
register_error_domain (NM_SETTINGS_ERROR,
|
|
NM_DBUS_INTERFACE_SETTINGS,
|
|
NM_TYPE_SETTINGS_ERROR);
|
|
register_error_domain (NM_VPN_PLUGIN_ERROR,
|
|
NM_DBUS_VPN_ERROR_PREFIX,
|
|
NM_TYPE_VPN_PLUGIN_ERROR);
|
|
}
|