diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-08-14 14:09:57 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-08-14 14:09:57 +0000 |
| commit | e3d15a5f73b5c5df841d2f7ec4fdd9a3f85eb605 (patch) | |
| tree | fcf71aaf8772ba038f2a38f1c978ec090d888c5d /libnm-glib/nm-client.h | |
| parent | d02e8b4886e1706f5279a3ddb5269c5998093f8b (diff) | |
| download | NetworkManager-e3d15a5f73b5c5df841d2f7ec4fdd9a3f85eb605.tar.gz | |
2007-08-14 Dan Williams <dcbw@redhat.com>
* include/NetworkManagerVPN.h
src/vpn-manager/nm-dbus-vpn.c
src/vpn-manager/nm-dbus-vpn.h
src/vpn-manager/nm-vpn-act-request.c
src/vpn-manager/nm-vpn-act-request.h
src/vpn-manager/nm-vpn-service.c
src/vpn-manager/nm-vpn-service.h
libnm-glib/nm-vpn-connection.c
libnm-glib/nm-vpn-connection.h
libnm-glib/nm-client.h
- Rename NM_VPN_STATE_* -> NM_VPN_SERVICE_STATE_* and NMVPNState ->
NMVPNServiceState to clarify what they apply to
- Rename NM_VPN_ACT_STAGE_* -> NM_VPN_CONNECTION_STATE_* and
NMVPNActStage -> NMVPNConnectionState for the same reason
* libnm-glib/nm-client.c
- Constant + type renames from above
- Properly handle NameOwnerChanged/manager_running signals
for NM service; only emit when state really changes
- Use hash tables correctly so that the key (which was previously owned
by the D-Bus message) now has the same lifetime as the value, since
the key is now taken from the the NMVPNConnection itself. This
really fixes the double-VPN names in the applet
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2677 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'libnm-glib/nm-client.h')
| -rw-r--r-- | libnm-glib/nm-client.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index 3c78352798..f6cb3375b9 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -35,7 +35,7 @@ typedef struct { void (*vpn_connection_added) (NMClient *client, NMVPNConnection *connection); void (*vpn_connection_removed) (NMClient *client, NMVPNConnection *connection); - void (*vpn_state_change) (NMClient *client, NMVPNActStage state); + void (*vpn_state_change) (NMClient *client, NMVPNConnectionState state); } NMClientClass; GType nm_client_get_type (void); @@ -62,7 +62,7 @@ NMVPNConnection *nm_client_get_vpn_connection_by_name (NMClient *client, void nm_client_remove_vpn_connection (NMClient *client, NMVPNConnection *connection); -NMVPNActStage nm_client_get_vpn_state (NMClient *client); +NMVPNConnectionState nm_client_get_vpn_state (NMClient *client); G_END_DECLS |