summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-01-21 14:29:16 -0600
committerDan Williams <dcbw@redhat.com>2014-01-23 17:34:13 -0600
commit48217172023c7a756f32aca7f1f34bead7083302 (patch)
tree572505bc7fe57dc21ea84c25a059fde6d4f598f4
parent66fb36a71d3eada025dc0a563508c2f25d93f476 (diff)
downloadNetworkManager-dcbw/dbus-properties.tar.gz
trivial: remove unused #definesdcbw/dbus-properties
These are no longer used by anything, but are determined automatically from the GObject property names.
-rw-r--r--libnm-glib/nm-access-point.c10
-rw-r--r--libnm-glib/nm-device-adsl.c1
-rw-r--r--libnm-glib/nm-device-bond.c4
-rw-r--r--libnm-glib/nm-device-bridge.c4
-rw-r--r--libnm-glib/nm-device-bt.c4
-rw-r--r--libnm-glib/nm-device-ethernet.c5
-rw-r--r--libnm-glib/nm-device-generic.c3
-rw-r--r--libnm-glib/nm-device-infiniband.c3
-rw-r--r--libnm-glib/nm-device-modem.c3
-rw-r--r--libnm-glib/nm-device-olpc-mesh.c4
-rw-r--r--libnm-glib/nm-device-team.c4
-rw-r--r--libnm-glib/nm-device-vlan.c4
-rw-r--r--libnm-glib/nm-device-wifi.c7
-rw-r--r--libnm-glib/nm-device-wimax.c8
-rw-r--r--libnm-glib/nm-vpn-connection.c3
-rw-r--r--libnm-glib/nm-wimax-nsp.c4
16 files changed, 0 insertions, 71 deletions
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index c185ab0b6c..3f6207c040 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -72,16 +72,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_FLAGS "Flags"
-#define DBUS_PROP_WPA_FLAGS "WpaFlags"
-#define DBUS_PROP_RSN_FLAGS "RsnFlags"
-#define DBUS_PROP_SSID "Ssid"
-#define DBUS_PROP_FREQUENCY "Frequency"
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_MODE "Mode"
-#define DBUS_PROP_MAX_BITRATE "MaxBitrate"
-#define DBUS_PROP_STRENGTH "Strength"
-
/**
* nm_access_point_new:
* @connection: the #DBusGConnection
diff --git a/libnm-glib/nm-device-adsl.c b/libnm-glib/nm-device-adsl.c
index d79519936a..e2db4da78f 100644
--- a/libnm-glib/nm-device-adsl.c
+++ b/libnm-glib/nm-device-adsl.c
@@ -46,7 +46,6 @@ enum {
PROP_CARRIER,
LAST_PROP
};
-#define DBUS_PROP_CARRIER "Carrier"
/**
* nm_device_adsl_error_quark:
diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c
index b6e40d2648..259f4dfcc0 100644
--- a/libnm-glib/nm-device-bond.c
+++ b/libnm-glib/nm-device-bond.c
@@ -56,10 +56,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_CARRIER "Carrier"
-#define DBUS_PROP_SLAVES "Slaves"
-
/**
* nm_device_bond_error_quark:
*
diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c
index f286c1a938..3709814de0 100644
--- a/libnm-glib/nm-device-bridge.c
+++ b/libnm-glib/nm-device-bridge.c
@@ -56,10 +56,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_CARRIER "Carrier"
-#define DBUS_PROP_SLAVES "Slaves"
-
/**
* nm_device_bridge_error_quark:
*
diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c
index 1d634e2306..0de34b79d1 100644
--- a/libnm-glib/nm-device-bt.c
+++ b/libnm-glib/nm-device-bt.c
@@ -55,10 +55,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_NAME "Name"
-#define DBUS_PROP_BT_CAPABILITIES "BtCapabilities"
-
/**
* nm_device_bt_error_quark:
*
diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c
index 338c498c8b..38424d2068 100644
--- a/libnm-glib/nm-device-ethernet.c
+++ b/libnm-glib/nm-device-ethernet.c
@@ -58,11 +58,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_PERM_HW_ADDRESS "PermHwAddress"
-#define DBUS_PROP_SPEED "Speed"
-#define DBUS_PROP_CARRIER "Carrier"
-
/**
* nm_device_ethernet_error_quark:
*
diff --git a/libnm-glib/nm-device-generic.c b/libnm-glib/nm-device-generic.c
index 46836ede0e..fa4247be5c 100644
--- a/libnm-glib/nm-device-generic.c
+++ b/libnm-glib/nm-device-generic.c
@@ -48,9 +48,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_TYPE_DESCRIPTION "TypeDescription"
-
/**
* nm_device_generic_error_quark:
*
diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c
index 0254dbf5c8..678269d94b 100644
--- a/libnm-glib/nm-device-infiniband.c
+++ b/libnm-glib/nm-device-infiniband.c
@@ -54,9 +54,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_CARRIER "Carrier"
-
/**
* nm_device_infiniband_error_quark:
*
diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c
index e7ac4d791f..d20f4f28a6 100644
--- a/libnm-glib/nm-device-modem.c
+++ b/libnm-glib/nm-device-modem.c
@@ -54,9 +54,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_MODEM_CAPS "ModemCapabilities"
-#define DBUS_PROP_CURRENT_CAPS "CurrentCapabilities"
-
/**
* nm_device_modem_error_quark:
*
diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c
index 8392e7ca13..058727f3ce 100644
--- a/libnm-glib/nm-device-olpc-mesh.c
+++ b/libnm-glib/nm-device-olpc-mesh.c
@@ -55,10 +55,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_COMPANION "Companion"
-#define DBUS_PROP_ACTIVE_CHANNEL "ActiveChannel"
-
/**
* nm_device_olpc_mesh_error_quark:
*
diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c
index 89d5b07541..5af9094c34 100644
--- a/libnm-glib/nm-device-team.c
+++ b/libnm-glib/nm-device-team.c
@@ -54,10 +54,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_CARRIER "Carrier"
-#define DBUS_PROP_SLAVES "Slaves"
-
/**
* nm_device_team_error_quark:
*
diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c
index 807b306602..5037441c22 100644
--- a/libnm-glib/nm-device-vlan.c
+++ b/libnm-glib/nm-device-vlan.c
@@ -55,10 +55,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_CARRIER "Carrier"
-#define DBUS_PROP_VLAN_ID "VlanId"
-
/**
* nm_device_vlan_error_quark:
*
diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
index 2d51a38ef1..a75495adcd 100644
--- a/libnm-glib/nm-device-wifi.c
+++ b/libnm-glib/nm-device-wifi.c
@@ -78,13 +78,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_PERM_HW_ADDRESS "PermHwAddress"
-#define DBUS_PROP_MODE "Mode"
-#define DBUS_PROP_BITRATE "Bitrate"
-#define DBUS_PROP_ACTIVE_ACCESS_POINT "ActiveAccessPoint"
-#define DBUS_PROP_WIRELESS_CAPABILITIES "WirelessCapabilities"
-
enum {
ACCESS_POINT_ADDED,
ACCESS_POINT_REMOVED,
diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c
index d834fd65e6..39a9188c56 100644
--- a/libnm-glib/nm-device-wimax.c
+++ b/libnm-glib/nm-device-wimax.c
@@ -71,14 +71,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_HW_ADDRESS "HwAddress"
-#define DBUS_PROP_ACTIVE_NSP "ActiveNsp"
-#define DBUS_PROP_CENTER_FREQUENCY "CenterFrequency"
-#define DBUS_PROP_RSSI "Rssi"
-#define DBUS_PROP_CINR "Cinr"
-#define DBUS_PROP_TX_POWER "TxPower"
-#define DBUS_PROP_BSID "Bsid"
-
enum {
NSP_ADDED,
NSP_REMOVED,
diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c
index abea04adb9..12814cf254 100644
--- a/libnm-glib/nm-vpn-connection.c
+++ b/libnm-glib/nm-vpn-connection.c
@@ -46,9 +46,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_VPN_STATE "VpnState"
-#define DBUS_PROP_BANNER "Banner"
-
enum {
VPN_STATE_CHANGED,
diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c
index b837f9cb42..f747aff3e6 100644
--- a/libnm-glib/nm-wimax-nsp.c
+++ b/libnm-glib/nm-wimax-nsp.c
@@ -55,10 +55,6 @@ enum {
LAST_PROP
};
-#define DBUS_PROP_NAME "Name"
-#define DBUS_PROP_SIGNAL_QUALITY "SignalQuality"
-#define DBUS_PROP_NETWORK_TYPE "NetworkType"
-
/**
* nm_wimax_nsp_new:
* @connection: the #DBusGConnection