diff options
| author | Dan Winship <danw@gnome.org> | 2012-01-19 18:23:28 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2012-02-03 10:33:43 -0600 |
| commit | 5afcee46936ab547a95fdaa7e415aa3ba6de47d2 (patch) | |
| tree | eeebe2e20e01b5bd99d8d1a32c06e8f3fc590d74 /libnm-glib/nm-vpn-connection.c | |
| parent | 2e48cc092c133ed3e10efcc00cf36b29c9d3efc8 (diff) | |
| download | NetworkManager-5afcee46936ab547a95fdaa7e415aa3ba6de47d2.tar.gz | |
libnm-glib: simplify property getter methods
Rather than having every property getter method have code to fetch
that specific property's value, just call the new
_nm_object_ensure_inited() (which makes sure that we've read all the
property values on the object at least once), and then return the
cached value. (After we've read the initial property values, the
PropertiesChanged signal handler will ensure that the values are kept
up to date, so we can always just return cached property values after
that point.)
This then lets us get rid of _nm_object_get_property() and its
wrappers.
Diffstat (limited to 'libnm-glib/nm-vpn-connection.c')
| -rw-r--r-- | libnm-glib/nm-vpn-connection.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c index 94d4110f43..58c2ea4fbb 100644 --- a/libnm-glib/nm-vpn-connection.c +++ b/libnm-glib/nm-vpn-connection.c @@ -99,21 +99,11 @@ nm_vpn_connection_get_banner (NMVPNConnection *vpn) priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn); /* We need to update vpn_state first in case it's unknown. */ - nm_vpn_connection_get_vpn_state (vpn); + _nm_object_ensure_inited (NM_OBJECT (vpn)); if (priv->vpn_state != NM_VPN_CONNECTION_STATE_ACTIVATED) return NULL; - if (!priv->banner) { - priv->banner = _nm_object_get_string_property (NM_OBJECT (vpn), - NM_DBUS_INTERFACE_VPN_CONNECTION, - DBUS_PROP_BANNER, - NULL); - if (priv->banner && !strlen (priv->banner)) { - g_free (priv->banner); - priv->banner = NULL; - } - } return priv->banner; } @@ -128,18 +118,10 @@ nm_vpn_connection_get_banner (NMVPNConnection *vpn) NMVPNConnectionState nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn) { - NMVPNConnectionPrivate *priv; - g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), NM_VPN_CONNECTION_STATE_UNKNOWN); - 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, - DBUS_PROP_VPN_STATE, - NULL); - } - return priv->vpn_state; + _nm_object_ensure_inited (NM_OBJECT (vpn)); + return NM_VPN_CONNECTION_GET_PRIVATE (vpn)->vpn_state; } static void |