diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-03-23 14:47:11 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-03-23 14:47:11 +0000 |
| commit | 30b85fa9f4db058d82af3ebc3a69e899858496a7 (patch) | |
| tree | 5a73b741ce5d7c55240326e04353489b48aa5b82 /include | |
| parent | 09eb801fe65e513fe440837ea03bb51ef67bc512 (diff) | |
| download | NetworkManager-30b85fa9f4db058d82af3ebc3a69e899858496a7.tar.gz | |
clean up; remove NMI_DBUS_USER_KEY_CANCELED_ERROR since it's no longer used
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3488 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'include')
| -rw-r--r-- | include/NetworkManager.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/NetworkManager.h b/include/NetworkManager.h index 30c5b95b0a..b3e9c50f6c 100644 --- a/include/NetworkManager.h +++ b/include/NetworkManager.h @@ -27,16 +27,18 @@ */ #define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" -#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" -#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" -#define NM_DBUS_INTERFACE_DEVICE "org.freedesktop.NetworkManager.Device" -#define NM_DBUS_INTERFACE_DEVICE_WIRED "org.freedesktop.NetworkManager.Device.Wired" -#define NM_DBUS_INTERFACE_DEVICE_WIRELESS "org.freedesktop.NetworkManager.Device.Wireless" -#define NM_DBUS_PATH_ACCESS_POINT "/org/freedesktop/NetworkManager/AccessPoint" -#define NM_DBUS_INTERFACE_ACCESS_POINT "org.freedesktop.NetworkManager.AccessPoint" -#define NM_DBUS_INTERFACE_GSM_DEVICE "org.freedesktop.NetworkManager.Device.Gsm" -#define NM_DBUS_INTERFACE_CDMA_DEVICE "org.freedesktop.NetworkManager.Device.Cdma" -#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION "org.freedesktop.NetworkManager.Connection.Active" +#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" +#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" +#define NM_DBUS_INTERFACE_DEVICE NM_DBUS_INTERFACE ".Device" +#define NM_DBUS_INTERFACE_DEVICE_WIRED NM_DBUS_INTERFACE_DEVICE ".Wired" +#define NM_DBUS_INTERFACE_DEVICE_WIRELESS NM_DBUS_INTERFACE_DEVICE ".Wireless" +#define NM_DBUS_PATH_ACCESS_POINT NM_DBUS_PATH "/AccessPoint" +#define NM_DBUS_INTERFACE_ACCESS_POINT NM_DBUS_INTERFACE ".AccessPoint" +#define NM_DBUS_INTERFACE_GSM_DEVICE NM_DBUS_INTERFACE_DEVICE ".Gsm" +#define NM_DBUS_INTERFACE_CDMA_DEVICE NM_DBUS_INTERFACE_DEVICE ".Cdma" +#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION NM_DBUS_INTERFACE ".Connection.Active" +#define NM_DBUS_INTERFACE_IP4_CONFIG NM_DBUS_INTERFACE ".IP4Config" + #define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings" #define NM_DBUS_SERVICE_SYSTEM_SETTINGS "org.freedesktop.NetworkManagerSystemSettings" @@ -47,8 +49,6 @@ #define NM_DBUS_PATH_SETTINGS_CONNECTION "/org/freedesktop/NetworkManagerSettings/Connection" #define NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS "org.freedesktop.NetworkManagerSettings.Connection.Secrets" -#define NMI_DBUS_USER_KEY_CANCELED_ERROR "org.freedesktop.NetworkManagerInfo.CanceledError" - /* * Types of NetworkManager states |