fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 12:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-glib: add 'vpn-state' and 'banner' properties to NMVPNConnection class

Browse source 
Without these properties, the errors like these occured:
  WARNING **: handle_property_changed: property 'vpn-state' changed but wasn't
  defined by object type NMVPNConnection.
This commit is contained in:
Jiří Klimeš 2010-03-12 11:03:14 +01:00
parent f46a601022
commit 15351042ba
3 changed files with 71 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm-glib/Makefile.am
View file

@ -132,7 +132,7 @@ libnm_glib_la_LIBADD = \
$(GUDEV_LIBS)
libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib.ver \
-version-info "4:0:2"
-version-info "4:1:2"
noinst_PROGRAMS = libnm-glib-test

71
libnm-glib/nm-vpn-connection.c
View file

@ -18,7 +18,7 @@
* Boston, MA 02110-1301 USA.
*
* Copyright (C) 2007 - 2008 Novell, Inc.
* Copyright (C) 2007 - 2008 Red Hat, Inc.
* Copyright (C) 2007 - 2010 Red Hat, Inc.
*/
#include <string.h>
@ -40,6 +40,17 @@ typedef struct {
NMVPNConnectionState vpn_state;
} NMVPNConnectionPrivate;
enum {
PROP_0,
PROP_VPN_STATE,
PROP_BANNER,
LAST_PROP
};
#define DBUS_PROP_VPN_STATE "VpnState"
#define DBUS_PROP_BANNER "Banner"
enum {
VPN_STATE_CHANGED,
@ -74,8 +85,8 @@ nm_vpn_connection_get_banner (NMVPNConnection *vpn)
if (!priv->banner) {
priv->banner = _nm_object_get_string_property (NM_OBJECT (vpn),
NM_DBUS_INTERFACE_VPN_CONNECTION,
"Banner");
NM_DBUS_INTERFACE_VPN_CONNECTION,
DBUS_PROP_BANNER);
if (priv->banner && !strlen (priv->banner)) {
g_free (priv->banner);
priv->banner = NULL;
@ -94,8 +105,8 @@ nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn)
priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn);
if (priv->vpn_state == NM_VPN_CONNECTION_STATE_UNKNOWN) {
priv->vpn_state = _nm_object_get_uint_property (NM_OBJECT (vpn),
NM_DBUS_INTERFACE_VPN_CONNECTION,
"VpnState");
NM_DBUS_INTERFACE_VPN_CONNECTION,
DBUS_PROP_VPN_STATE);
}
return priv->vpn_state;
}
@ -172,6 +183,27 @@ finalize (GObject *object)
G_OBJECT_CLASS (nm_vpn_connection_parent_class)->finalize (object);
}
static void
get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
NMVPNConnection *self = NM_VPN_CONNECTION (object);
switch (prop_id) {
case PROP_VPN_STATE:
g_value_set_uint (value, nm_vpn_connection_get_vpn_state (self));
break;
case PROP_BANNER:
g_value_set_string (value, nm_vpn_connection_get_banner (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
{
@ -181,8 +213,37 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
/* virtual methods */
object_class->constructor = constructor;
object_class->get_property = get_property;
object_class->finalize = finalize;
/* properties */
/**
* NMVPNConnection:vpn-state:
*
* The VPN state of the active VPN connection.
**/
g_object_class_install_property (object_class, PROP_VPN_STATE,
g_param_spec_uint (NM_VPN_CONNECTION_VPN_STATE,
"VpnState",
"Current VPN state",
NM_VPN_CONNECTION_STATE_UNKNOWN,
NM_VPN_CONNECTION_STATE_DISCONNECTED,
NM_VPN_CONNECTION_STATE_UNKNOWN,
G_PARAM_READABLE));
/**
* NMVPNConnection:banner:
*
* The VPN login banner of the active VPN connection.
**/
g_object_class_install_property (object_class, PROP_BANNER,
g_param_spec_string (NM_VPN_CONNECTION_BANNER,
"Banner",
"Login Banner",
NULL,
G_PARAM_READABLE));
/* signals */
signals[VPN_STATE_CHANGED] =
g_signal_new ("vpn-state-changed",

5
libnm-glib/nm-vpn-connection.h
View file

@ -18,7 +18,7 @@
* Boston, MA 02110-1301 USA.
*
* Copyright (C) 2007 - 2008 Novell, Inc.
* Copyright (C) 2007 - 2008 Red Hat, Inc.
* Copyright (C) 2007 - 2010 Red Hat, Inc.
*/
#ifndef NM_VPN_CONNECTION_H
@ -39,6 +39,9 @@ G_BEGIN_DECLS
#define NM_IS_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPN_CONNECTION))
#define NM_VPN_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass))
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
#define NM_VPN_CONNECTION_BANNER "banner"
typedef struct {
NMActiveConnection parent;
} NMVPNConnection;