colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: remove code for unused NM_WIFI_P2P_PEER_GROUPS property

Browse Source
This commit is contained in:
Thomas Haller
2020-01-15 13:45:10 +01:00
parent e00d36f5dd
commit 21d4a26188
2 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/devices/wifi/nm-wifi-p2p-peer.c
View File

@@ -28,7 +28,6 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMWifiP2PPeer,
PROP_MODEL_NUMBER, PROP_MODEL_NUMBER,
PROP_SERIAL, PROP_SERIAL,
PROP_WFD_IES, PROP_WFD_IES,
PROP_GROUPS,
PROP_HW_ADDRESS, PROP_HW_ADDRESS,
PROP_STRENGTH, PROP_STRENGTH,
PROP_LAST_SEEN, PROP_LAST_SEEN,
@@ -314,26 +313,6 @@ nm_wifi_p2p_peer_get_groups (const NMWifiP2PPeer *peer)
return (const char * const*) NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->groups; return (const char * const*) NM_WIFI_P2P_PEER_GET_PRIVATE (peer)->groups;
} }
static gboolean
nm_wifi_p2p_peer_set_groups (NMWifiP2PPeer *peer, const char** groups)
{
NMWifiP2PPeerPrivate *priv;
g_return_val_if_fail (NM_IS_WIFI_P2P_PEER (peer), FALSE);
g_return_val_if_fail (groups != NULL, FALSE);
priv = NM_WIFI_P2P_PEER_GET_PRIVATE (peer);
if (_nm_utils_strv_equal (priv->groups, (char **) groups))
return FALSE;
g_strfreev (priv->groups);
priv->groups = g_strdupv ((char**) groups);
_notify (peer, PROP_GROUPS);
return TRUE;
}
const char * const char *
nm_wifi_p2p_peer_get_address (const NMWifiP2PPeer *peer) nm_wifi_p2p_peer_get_address (const NMWifiP2PPeer *peer)
{ {
@@ -434,7 +413,6 @@ nm_wifi_p2p_peer_update_from_properties (NMWifiP2PPeer *peer,
GVariant *v; GVariant *v;
gsize len; gsize len;
const char *s; const char *s;
const char **sv;
gint32 i32; gint32 i32;
gboolean changed = FALSE; gboolean changed = FALSE;
@@ -484,16 +462,6 @@ nm_wifi_p2p_peer_update_from_properties (NMWifiP2PPeer *peer,
g_variant_unref (v); g_variant_unref (v);
} }
v = g_variant_lookup_value (properties, "Groups", G_VARIANT_TYPE_OBJECT_PATH_ARRAY);
if (v) {
sv = g_variant_get_objv (v, NULL);
changed |= nm_wifi_p2p_peer_set_groups (peer, sv);
g_free (sv);
}
/*if (max_rate)
changed |= nm_wifi_p2p_peer_set_max_bitrate (peer, max_rate / 1000);*/
if (!priv->supplicant_path) { if (!priv->supplicant_path) {
priv->supplicant_path = g_strdup (supplicant_path); priv->supplicant_path = g_strdup (supplicant_path);
changed = TRUE; changed = TRUE;
@@ -601,12 +569,6 @@ get_property (GObject *object, guint prop_id,
case PROP_WFD_IES: case PROP_WFD_IES:
g_value_take_variant (value, nm_utils_gbytes_to_variant_ay (priv->wfd_ies)); g_value_take_variant (value, nm_utils_gbytes_to_variant_ay (priv->wfd_ies));
break; break;
case PROP_GROUPS:
g_value_set_variant (value,
g_variant_new_strv ( (const char*const*) priv->groups
?: NM_PTRARRAY_EMPTY (const char *),
-1));
break;
case PROP_HW_ADDRESS: case PROP_HW_ADDRESS:
g_value_set_string (value, priv->address); g_value_set_string (value, priv->address);
break; break;
@@ -756,12 +718,6 @@ nm_wifi_p2p_peer_class_init (NMWifiP2PPeerClass *klass)
NULL, NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
obj_properties[PROP_GROUPS] =
g_param_spec_variant (NM_WIFI_P2P_PEER_GROUPS, "", "",
G_VARIANT_TYPE ("as"),
NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
obj_properties[PROP_HW_ADDRESS] = obj_properties[PROP_HW_ADDRESS] =
g_param_spec_string (NM_WIFI_P2P_PEER_HW_ADDRESS, "", "", g_param_spec_string (NM_WIFI_P2P_PEER_HW_ADDRESS, "", "",
NULL, NULL,

1
src/devices/wifi/nm-wifi-p2p-peer.h
View File

@@ -24,7 +24,6 @@
#define NM_WIFI_P2P_PEER_MODEL_NUMBER "model-number" #define NM_WIFI_P2P_PEER_MODEL_NUMBER "model-number"
#define NM_WIFI_P2P_PEER_SERIAL "serial" #define NM_WIFI_P2P_PEER_SERIAL "serial"
#define NM_WIFI_P2P_PEER_WFD_IES "wfd-ies" #define NM_WIFI_P2P_PEER_WFD_IES "wfd-ies"
#define NM_WIFI_P2P_PEER_GROUPS "groups"
#define NM_WIFI_P2P_PEER_HW_ADDRESS "hw-address" #define NM_WIFI_P2P_PEER_HW_ADDRESS "hw-address"
#define NM_WIFI_P2P_PEER_STRENGTH "strength" #define NM_WIFI_P2P_PEER_STRENGTH "strength"
#define NM_WIFI_P2P_PEER_LAST_SEEN "last-seen" #define NM_WIFI_P2P_PEER_LAST_SEEN "last-seen"