2007-02-20 Tambet Ingo <tambet@ximian.com>
* libnm-glib/nm-device-802-11-wireless.c: Add "network-added" and "network-removed" signals. * libnm-glib/libnm-glib.pc.in: Require NetworkManager >= 0.7.0. * libnm-glib/nm-access-point.c: Add "strength-changed" signal, emit it when receiving the signal from dbus. * src/nm-device-802-11-wireless.c (get_property): Fix PROP_ACTIVE_NETWORK property. * src/NetworkManagerPolicy.c (state_changed): Fix a typo to make the deactivation of the previously activated device working again. * src/nm-activation-request.c: Remove NMActStage property and it's getter and setter. * src/nm-device.c (nm_device_is_activated): Remove. state == NM_DEVICE_STATE_ACTIVATED is just as easy to use. * include/NetworkManager.h: Remove NM_DBUS_NO_DEVICES_ERROR, NM_DBUS_NO_DIALUP_ERROR, NM_DBUS_NO_NETWORKS_ERROR, NM_DBUS_NO_ACTIVE_DEVICE_ERROR, NM_DBUS_NO_ACTIVE_NET_ERROR errors and NM_DBUS_SIGNAL_STATE_CHANGE signal. Remove NMNetworkStatus and NMActStage enums. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2345 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -41,24 +41,9 @@
|
||||
#define NMI_DBUS_INTERFACE "org.freedesktop.NetworkManagerInfo"
|
||||
|
||||
|
||||
/*
|
||||
* Some common errors
|
||||
*/
|
||||
#define NM_DBUS_NO_DEVICES_ERROR "org.freedesktop.NetworkManager.NoDevices"
|
||||
#define NM_DBUS_NO_DIALUP_ERROR "org.freedesktop.NetworkManager.NoDialup"
|
||||
#define NM_DBUS_NO_NETWORKS_ERROR "org.freedesktop.NetworkManager.NoNetworks"
|
||||
#define NM_DBUS_NO_ACTIVE_DEVICE_ERROR "org.freedesktop.NetworkManager.NoActiveDevice"
|
||||
#define NM_DBUS_NO_ACTIVE_NET_ERROR "org.freedesktop.NetworkManager.NoActiveNetwork"
|
||||
|
||||
#define NMI_DBUS_USER_KEY_CANCELED_ERROR "org.freedesktop.NetworkManagerInfo.CanceledError"
|
||||
|
||||
|
||||
/*
|
||||
* NetworkManager signals
|
||||
*/
|
||||
#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
|
||||
|
||||
|
||||
/*
|
||||
* Types of NetworkManager devices
|
||||
*/
|
||||
@@ -135,17 +120,6 @@ typedef enum NMDeviceType
|
||||
#define NM_EAP_METHOD_TLS 0x00000020 /* EAP-TLS */
|
||||
#define NM_EAP_METHOD_TTLS 0x00000040 /* EAP-TTLS */
|
||||
|
||||
/*
|
||||
* Wireless network update types
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
NETWORK_STATUS_DISAPPEARED = 0,
|
||||
NETWORK_STATUS_APPEARED,
|
||||
NETWORK_STATUS_STRENGTH_CHANGED
|
||||
} NMNetworkStatus;
|
||||
|
||||
|
||||
/*
|
||||
* Wireless network types
|
||||
*/
|
||||
@@ -158,24 +132,6 @@ typedef enum NMNetworkType
|
||||
} NMNetworkType;
|
||||
|
||||
|
||||
/*
|
||||
* Device activation stages
|
||||
*/
|
||||
typedef enum NMActStage
|
||||
{
|
||||
NM_ACT_STAGE_UNKNOWN = 0,
|
||||
NM_ACT_STAGE_DEVICE_PREPARE,
|
||||
NM_ACT_STAGE_DEVICE_CONFIG,
|
||||
NM_ACT_STAGE_NEED_USER_KEY,
|
||||
NM_ACT_STAGE_IP_CONFIG_START,
|
||||
NM_ACT_STAGE_IP_CONFIG_GET,
|
||||
NM_ACT_STAGE_IP_CONFIG_COMMIT,
|
||||
NM_ACT_STAGE_ACTIVATED,
|
||||
NM_ACT_STAGE_FAILED,
|
||||
NM_ACT_STAGE_CANCELLED
|
||||
} NMActStage;
|
||||
|
||||
|
||||
/*
|
||||
* Device states. Will obsolete NMActStage soon.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user