msgid "NOTE: the libc resolver may not support more than 3 nameservers."
msgstr "ЗАБЕЛЕЖКА: libc може да не поддържа повече от 3 сървъра за имена."
- #: ../src/dns-manager/nm-dns-manager.c:386
+ #: ../src/dns-manager/nm-dns-manager.c:369
msgid "The nameservers listed below may not be recognized."
- msgstr "Ð\94олните сървъри за имена може да не бъдат разпознати."
+ msgstr "Следните сървъри за имена може да не бъдат разпознати."
-#: ../src/system-settings/nm-default-wired-connection.c:157
+#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Автоматично %s"
#include "nm-properties-changed-signal.h"
#include "nm-active-connection.h"
#include "nm-dbus-glib-types.h"
+ #include "nm-active-connection-glue.h"
-static void secrets_provider_interface_init (NMSecretsProviderInterface *sp_interface_class);
+G_DEFINE_TYPE (NMActRequest, nm_act_request, G_TYPE_OBJECT)
-G_DEFINE_TYPE_EXTENDED (NMActRequest, nm_act_request, G_TYPE_OBJECT, 0,
- G_IMPLEMENT_INTERFACE (NM_TYPE_SECRETS_PROVIDER_INTERFACE,
- secrets_provider_interface_init))
-
-#define NM_ACT_REQUEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_ACT_REQUEST, NMActRequestPrivate))
+#define NM_ACT_REQUEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+ NM_TYPE_ACT_REQUEST, \
+ NMActRequestPrivate))
enum {
- CONNECTION_SECRETS_UPDATED,
- CONNECTION_SECRETS_FAILED,
PROPERTIES_CHANGED,
-
LAST_SIGNAL
};
-
static guint signals[LAST_SIGNAL] = { 0 };
typedef struct {
priv->share_rules = g_slist_append (priv->share_rules, rule);
}
-GObject *
-nm_act_request_get_device (NMActRequest *req)
+/********************************************************************/
+
+static void
+device_state_changed (NMDevice *device,
+ NMDeviceState new_state,
+ NMDeviceState old_state,
+ NMDeviceStateReason reason,
+ gpointer user_data)
{
- g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
+ NMActRequest *self = NM_ACT_REQUEST (user_data);
+ NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (self);
+ NMActiveConnectionState new_ac_state;
+ gboolean new_default = FALSE, new_default6 = FALSE;
- return G_OBJECT (NM_ACT_REQUEST_GET_PRIVATE (req)->device);
+ /* Set NMActiveConnection state based on the device's state */
+ switch (new_state) {
+ case NM_DEVICE_STATE_PREPARE:
+ case NM_DEVICE_STATE_CONFIG:
+ case NM_DEVICE_STATE_NEED_AUTH:
+ case NM_DEVICE_STATE_IP_CONFIG:
+ new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATING;
+ break;
+ case NM_DEVICE_STATE_ACTIVATED:
+ new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATED;
+ new_default = priv->is_default;
+ new_default6 = priv->is_default6;
+ break;
+ default:
+ new_ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN;
+ break;
+ }
+
+ if (new_ac_state != priv->state) {
+ priv->state = new_ac_state;
+ g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_STATE);
+ }
+
+ if (new_default != priv->is_default) {
+ priv->is_default = new_default;
+ g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_DEFAULT);
+ }
+
+ if (new_default6 != priv->is_default6) {
+ priv->is_default6 = new_default6;
+ g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_DEFAULT6);
+ }
}
-gboolean
-nm_act_request_get_assumed (NMActRequest *req)
+/********************************************************************/
+
+NMActRequest *
+nm_act_request_new (NMConnection *connection,
+ const char *specific_object,
+ NMAgentManager *agent_mgr,
+ gboolean user_requested,
+ gboolean assumed,
+ gpointer *device)
{
- g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE);
+ GObject *object;
+ NMActRequestPrivate *priv;
- return NM_ACT_REQUEST_GET_PRIVATE (req)->assumed;
+ g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
+ g_return_val_if_fail (NM_IS_AGENT_MANAGER (agent_mgr), NULL);
+ g_return_val_if_fail (NM_DEVICE (device), NULL);
+
+ object = g_object_new (NM_TYPE_ACT_REQUEST, NULL);
+ if (!object)
+ return NULL;
+
+ priv = NM_ACT_REQUEST_GET_PRIVATE (object);
+
+ priv->connection = g_object_ref (connection);
+ if (specific_object)
+ priv->specific_object = g_strdup (specific_object);
+
+ priv->agent_mgr = g_object_ref (agent_mgr);
+
+ priv->device = NM_DEVICE (device);
+ g_signal_connect (device, "state-changed",
+ G_CALLBACK (device_state_changed),
+ NM_ACT_REQUEST (object));
+
+ priv->user_requested = user_requested;
+ priv->assumed = assumed;
+
+ return NM_ACT_REQUEST (object);
+}
+
+static void
+nm_act_request_init (NMActRequest *req)
+{
+ NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (req);
+ NMDBusManager *dbus_mgr;
+
+ priv->ac_path = nm_active_connection_get_next_object_path ();
+ priv->state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN;
+
+ dbus_mgr = nm_dbus_manager_get ();
+ dbus_g_connection_register_g_object (nm_dbus_manager_get_connection (dbus_mgr),
+ priv->ac_path,
+ G_OBJECT (req));
+ g_object_unref (dbus_mgr);
+}
+
+static void
+get_property (GObject *object, guint prop_id,
+ GValue *value, GParamSpec *pspec)
+{
+ NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (object);
+ GPtrArray *devices;
+
+ switch (prop_id) {
+ case PROP_CONNECTION:
+ g_value_set_boxed (value, nm_connection_get_path (priv->connection));
+ break;
+ case PROP_SPECIFIC_OBJECT:
+ if (priv->specific_object)
+ g_value_set_boxed (value, priv->specific_object);
+ else
+ g_value_set_boxed (value, "/");
+ break;
+ case PROP_DEVICES:
+ devices = g_ptr_array_sized_new (1);
+ g_ptr_array_add (devices, g_strdup (nm_device_get_path (priv->device)));
+ g_value_take_boxed (value, devices);
+ break;
+ case PROP_STATE:
+ g_value_set_uint (value, priv->state);
+ break;
+ case PROP_DEFAULT:
+ g_value_set_boolean (value, priv->is_default);
+ break;
+ case PROP_DEFAULT6:
+ g_value_set_boolean (value, priv->is_default6);
+ break;
+ case PROP_VPN:
+ g_value_set_boolean (value, FALSE);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+dispose (GObject *object)
+{
+ NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (object);
+ GSList *iter;
+
+ if (priv->disposed) {
+ G_OBJECT_CLASS (nm_act_request_parent_class)->dispose (object);
+ return;
+ }
+ priv->disposed = TRUE;
+
+ g_assert (priv->connection);
+
+ g_signal_handlers_disconnect_by_func (G_OBJECT (priv->device),
+ G_CALLBACK (device_state_changed),
+ NM_ACT_REQUEST (object));
+
+ /* Clear any share rules */
+ nm_act_request_set_shared (NM_ACT_REQUEST (object), FALSE);
+
+ g_object_unref (priv->connection);
+
+ for (iter = priv->secrets_calls; iter; iter = g_slist_next (iter)) {
+ nm_agent_manager_cancel_secrets (priv->agent_mgr,
+ GPOINTER_TO_UINT (iter->data));
+ }
+ g_slist_free (priv->secrets_calls);
+ g_object_unref (priv->agent_mgr);
+
+ G_OBJECT_CLASS (nm_act_request_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
+ NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE (object);
+
+ g_free (priv->specific_object);
+ g_free (priv->ac_path);
+
+ clear_share_rules (NM_ACT_REQUEST (object));
+
+ G_OBJECT_CLASS (nm_act_request_parent_class)->finalize (object);
+}
+
+static void
+nm_act_request_class_init (NMActRequestClass *req_class)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (req_class);
+
+ g_type_class_add_private (req_class, sizeof (NMActRequestPrivate));
+
+ /* virtual methods */
+ object_class->get_property = get_property;
+ object_class->dispose = dispose;
+ object_class->finalize = finalize;
+
+ /* properties */
- g_object_class_install_property
- (object_class, PROP_CONNECTION,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION,
- "Connection",
- "Connection",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE));
- g_object_class_install_property
- (object_class, PROP_SPECIFIC_OBJECT,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT,
- "Specific object",
- "Specific object",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE));
- g_object_class_install_property
- (object_class, PROP_DEVICES,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES,
- "Devices",
- "Devices",
- DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
- G_PARAM_READABLE));
- g_object_class_install_property
- (object_class, PROP_STATE,
- g_param_spec_uint (NM_ACTIVE_CONNECTION_STATE,
- "State",
- "State",
- NM_ACTIVE_CONNECTION_STATE_UNKNOWN,
- NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
- NM_ACTIVE_CONNECTION_STATE_UNKNOWN,
- G_PARAM_READABLE));
- g_object_class_install_property
- (object_class, PROP_DEFAULT,
- g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT,
- "Default",
- "Is the default IPv4 active connection",
- FALSE,
- G_PARAM_READABLE));
- g_object_class_install_property
- (object_class, PROP_DEFAULT6,
- g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT6,
- "Default6",
- "Is the default IPv6 active connection",
- FALSE,
- G_PARAM_READABLE));
- g_object_class_install_property
- (object_class, PROP_VPN,
- g_param_spec_boolean (NM_ACTIVE_CONNECTION_VPN,
- "VPN",
- "Is a VPN connection",
- FALSE,
- G_PARAM_READABLE));
++ nm_active_connection_install_properties (object_class,
++ PROP_CONNECTION,
++ PROP_SPECIFIC_OBJECT,
++ PROP_DEVICES,
++ PROP_STATE,
++ PROP_DEFAULT,
++ PROP_DEFAULT6,
++ PROP_VPN);
+
+ /* Signals */
+ signals[PROPERTIES_CHANGED] =
+ nm_properties_changed_signal_new (object_class,
- G_STRUCT_OFFSET (NMActRequestClass, properties_changed));
++ G_STRUCT_OFFSET (NMActRequestClass, properties_changed));
+
- nm_active_connection_install_type_info (object_class);
++ dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (req_class),
++ &dbus_glib_nm_active_connection_object_info);
}
return g_strdup_printf (NM_DBUS_PATH "/ActiveConnection/%d", counter++);
}
-void
-nm_active_connection_scope_to_value (NMConnection *connection, GValue *value)
-{
- if (!connection) {
- g_value_set_string (value, "");
- return;
- }
-
- switch (nm_connection_get_scope (connection)) {
- case NM_CONNECTION_SCOPE_SYSTEM:
- g_value_set_string (value, NM_DBUS_SERVICE_SYSTEM_SETTINGS);
- break;
- case NM_CONNECTION_SCOPE_USER:
- g_value_set_string (value, NM_DBUS_SERVICE_USER_SETTINGS);
- break;
- default:
- nm_log_err (LOGD_CORE, "unknown connection scope!");
- break;
- }
-}
-
void
- nm_active_connection_install_type_info (GObjectClass *klass)
+ nm_active_connection_install_properties (GObjectClass *object_class,
- guint prop_service_name,
+ guint prop_connection,
+ guint prop_specific_object,
+ guint prop_devices,
+ guint prop_state,
+ guint prop_default,
+ guint prop_default6,
+ guint prop_vpn)
{
- dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
- &dbus_glib_nm_active_connection_object_info);
- g_object_class_install_property (object_class, prop_service_name,
- g_param_spec_string (NM_ACTIVE_CONNECTION_SERVICE_NAME,
- "Service name",
- "Service name",
- NULL,
- G_PARAM_READABLE));
-
+ g_object_class_install_property (object_class, prop_connection,
+ g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION,
+ "Connection",
+ "Connection",
+ DBUS_TYPE_G_OBJECT_PATH,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (object_class, prop_specific_object,
+ g_param_spec_boxed (NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT,
+ "Specific object",
+ "Specific object",
+ DBUS_TYPE_G_OBJECT_PATH,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (object_class, prop_devices,
+ g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES,
+ "Devices",
+ "Devices",
+ DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (object_class, prop_state,
+ g_param_spec_uint (NM_ACTIVE_CONNECTION_STATE,
+ "State",
+ "State",
+ NM_ACTIVE_CONNECTION_STATE_UNKNOWN,
+ NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
+ NM_ACTIVE_CONNECTION_STATE_UNKNOWN,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (object_class, prop_default,
+ g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT,
+ "Default",
+ "Is the default IPv4 active connection",
+ FALSE,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (object_class, prop_default6,
+ g_param_spec_boolean (NM_ACTIVE_CONNECTION_DEFAULT6,
+ "Default6",
+ "Is the default IPv6 active connection",
+ FALSE,
+ G_PARAM_READABLE));
+
+ g_object_class_install_property (object_class, prop_vpn,
+ g_param_spec_boolean (NM_ACTIVE_CONNECTION_VPN,
+ "VPN",
+ "Is a VPN connection",
+ FALSE,
+ G_PARAM_READABLE));
}
char *nm_active_connection_get_next_object_path (void);
- void nm_active_connection_install_type_info (GObjectClass *klass);
-void nm_active_connection_scope_to_value (NMConnection *connection, GValue *value);
-
+ void nm_active_connection_install_properties (GObjectClass *object_class,
- guint prop_service_name,
+ guint prop_connection,
+ guint prop_specific_object,
+ guint prop_devices,
+ guint prop_state,
+ guint prop_default,
+ guint prop_default6,
+ guint prop_vpn);
#endif /* NM_ACTIVE_CONNECTION_H */
if ( nm_device_interface_can_assume_connections (NM_DEVICE_INTERFACE (self))
&& (nm_device_get_state (self) == NM_DEVICE_STATE_ACTIVATED)) {
NMConnection *connection;
- NMSettingIP4Config *s_ip4;
+ NMSettingIP4Config *s_ip4 = NULL;
const char *method = NULL;
- /* Only system connections can be left up */
connection = nm_act_request_get_connection (priv->act_request);
- if ( connection
- && (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM)) {
+ if (connection) {
/* Only static or DHCP IPv4 connections can be left up.
* All IPv6 connections can be left up, so we don't have
--- /dev/null
- PROP_SERVICE_NAME,
+ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+ /* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2005 - 2011 Red Hat, Inc.
+ * Copyright (C) 2007 - 2008 Novell, Inc.
+ */
+
+ #include "NetworkManager.h"
+ #include "nm-vpn-connection-base.h"
+ #include "nm-active-connection.h"
+ #include "nm-vpn-connection-base-glue.h"
+ #include "nm-dbus-manager.h"
+
+ G_DEFINE_ABSTRACT_TYPE (NMVpnConnectionBase, nm_vpn_connection_base, G_TYPE_OBJECT)
+
+ #define NM_VPN_CONNECTION_BASE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+ NM_TYPE_VPN_CONNECTION_BASE, \
+ NMVpnConnectionBasePrivate))
+
+ typedef struct {
+ gboolean disposed;
+
+ NMConnection *connection;
+ char *ac_path;
+ gboolean is_default;
+ gboolean is_default6;
+ NMActiveConnectionState state;
+ } NMVpnConnectionBasePrivate;
+
+ enum {
+ PROP_0,
- case PROP_SERVICE_NAME:
- nm_active_connection_scope_to_value (priv->connection, value);
- break;
+ PROP_CONNECTION,
+ PROP_SPECIFIC_OBJECT,
+ PROP_DEVICES,
+ PROP_STATE,
+ PROP_DEFAULT,
+ PROP_DEFAULT6,
+ PROP_VPN,
+
+ LAST_PROP
+ };
+
+ /****************************************************************/
+
+ void
+ nm_vpn_connection_base_set_state (NMVpnConnectionBase *self,
+ NMVPNConnectionState vpn_state)
+ {
+ NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (self);
+ NMActiveConnectionState new_ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN;
+
+ /* Set the NMActiveConnection state based on VPN state */
+ switch (vpn_state) {
+ case NM_VPN_CONNECTION_STATE_PREPARE:
+ case NM_VPN_CONNECTION_STATE_NEED_AUTH:
+ case NM_VPN_CONNECTION_STATE_CONNECT:
+ case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
+ new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATING;
+ break;
+ case NM_VPN_CONNECTION_STATE_ACTIVATED:
+ new_ac_state = NM_ACTIVE_CONNECTION_STATE_ACTIVATED;
+ break;
+ default:
+ break;
+ }
+
+ if (new_ac_state != priv->state) {
+ priv->state = new_ac_state;
+ g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_STATE);
+ }
+ }
+
+ const char *
+ nm_vpn_connection_base_get_ac_path (NMVpnConnectionBase *self)
+ {
+ return NM_VPN_CONNECTION_BASE_GET_PRIVATE (self)->ac_path;
+ }
+
+ void
+ nm_vpn_connection_base_export (NMVpnConnectionBase *self,
+ NMConnection *connection)
+ {
+ NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (self);
+ NMDBusManager *dbus_mgr;
+
+ g_return_if_fail (priv->connection == NULL);
+
+ priv->connection = g_object_ref (connection);
+
+ dbus_mgr = nm_dbus_manager_get ();
+ dbus_g_connection_register_g_object (nm_dbus_manager_get_connection (dbus_mgr),
+ priv->ac_path, G_OBJECT (self));
+ g_object_unref (dbus_mgr);
+ }
+
+ /****************************************************************/
+
+ static void
+ nm_vpn_connection_base_init (NMVpnConnectionBase *self)
+ {
+ NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (self);
+
+ priv->state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN;
+ priv->ac_path = nm_active_connection_get_next_object_path ();
+ }
+
+ static void
+ dispose (GObject *object)
+ {
+ NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (object);
+
+ if (!priv->disposed) {
+ priv->disposed = TRUE;
+
+ g_free (priv->ac_path);
+ g_object_unref (priv->connection);
+ }
+
+ G_OBJECT_CLASS (nm_vpn_connection_base_parent_class)->dispose (object);
+ }
+
+ static void
+ get_property (GObject *object, guint prop_id,
+ GValue *value, GParamSpec *pspec)
+ {
+ NMVpnConnectionBasePrivate *priv = NM_VPN_CONNECTION_BASE_GET_PRIVATE (object);
+
+ switch (prop_id) {
- PROP_SERVICE_NAME,
+ case PROP_CONNECTION:
+ g_value_set_boxed (value, nm_connection_get_path (priv->connection));
+ break;
+ case PROP_SPECIFIC_OBJECT:
+ g_value_set_boxed (value, priv->ac_path);
+ break;
+ case PROP_DEVICES:
+ g_value_take_boxed (value, g_ptr_array_new ());
+ break;
+ case PROP_STATE:
+ g_value_set_uint (value, priv->state);
+ break;
+ case PROP_DEFAULT:
+ g_value_set_boolean (value, priv->is_default);
+ break;
+ case PROP_DEFAULT6:
+ g_value_set_boolean (value, priv->is_default6);
+ break;
+ case PROP_VPN:
+ g_value_set_boolean (value, TRUE);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+ }
+
+ static void
+ nm_vpn_connection_base_class_init (NMVpnConnectionBaseClass *vpn_class)
+ {
+ GObjectClass *object_class = G_OBJECT_CLASS (vpn_class);
+
+ g_type_class_add_private (vpn_class, sizeof (NMVpnConnectionBasePrivate));
+
+ /* virtual methods */
+ object_class->get_property = get_property;
+ object_class->dispose = dispose;
+
+ /* properties */
+ nm_active_connection_install_properties (object_class,
+ PROP_CONNECTION,
+ PROP_SPECIFIC_OBJECT,
+ PROP_DEVICES,
+ PROP_STATE,
+ PROP_DEFAULT,
+ PROP_DEFAULT6,
+ PROP_VPN);
+
+ dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (vpn_class),
+ &dbus_glib_nm_vpn_connection_base_object_info);
+ }
+
#include "nm-vpn-connection-glue.h"
- G_DEFINE_TYPE (NMVPNConnection, nm_vpn_connection, G_TYPE_OBJECT)
-static void secrets_provider_interface_init (NMSecretsProviderInterface *sp_interface_class);
-
-G_DEFINE_TYPE_EXTENDED (NMVPNConnection, nm_vpn_connection, NM_TYPE_VPN_CONNECTION_BASE, 0,
- G_IMPLEMENT_INTERFACE (NM_TYPE_SECRETS_PROVIDER_INTERFACE,
- secrets_provider_interface_init))
++G_DEFINE_TYPE (NMVPNConnection, nm_vpn_connection, NM_TYPE_VPN_CONNECTION_BASE)
typedef struct {
gboolean disposed;
NMConnection *connection;
NMActRequest *act_request;
- char *ac_path;
+ guint32 secrets_id;
NMDevice *parent_dev;
gulong device_monitor;
#include "NetworkManagerVPN.h"
#include "nm-device.h"
#include "nm-activation-request.h"
-#include "nm-secrets-provider-interface.h"
+ #include "nm-vpn-connection-base.h"
#define NM_TYPE_VPN_CONNECTION (nm_vpn_connection_get_type ())
#define NM_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnection))
projects / NetworkManager.git / commitdiff