applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Port to libnm 1.2

Browse source 
We also remove support for WiMAX (now unsupported by NetworkManager),
and InfiniBand (Enterprise feature), and the use of
the deprecated NM_SETTING_WIRELESS_SEC property.

With help from network-manager-applet patches by Jiří Klimeš and
Dan Winship.

https://bugzilla.gnome.org/show_bug.cgi?id=765910
This commit is contained in:
Bastien Nocera 2016-04-29 16:05:54 +02:00
parent 8400d3ed81
commit 9183d34947
62 changed files with 953 additions and 1427 deletions
Download patch file Download diff file Expand all files Collapse all files

23
panels/network/net-object.c
View file

@ -35,7 +35,6 @@ struct _NetObjectPrivate
gboolean removable;
GCancellable *cancellable;
NMClient *client;
NMRemoteSettings *remote_settings;
CcNetworkPanel *panel;
};
@ -45,7 +44,6 @@ enum {
PROP_TITLE,
PROP_REMOVABLE,
PROP_CLIENT,
PROP_REMOTE_SETTINGS,
PROP_CANCELLABLE,
PROP_PANEL,
PROP_LAST
@ -122,13 +120,6 @@ net_object_get_client (NetObject *object)
return object->priv->client;
}
NMRemoteSettings *
net_object_get_remote_settings (NetObject *object)
{
g_return_val_if_fail (NET_IS_OBJECT (object), NULL);
return object->priv->remote_settings;
}
GCancellable *
net_object_get_cancellable (NetObject *object)
{
@ -213,9 +204,6 @@ net_object_get_property (GObject *object_,
case PROP_CLIENT:
g_value_set_pointer (value, priv->client);
break;
case PROP_REMOTE_SETTINGS:
g_value_set_pointer (value, priv->remote_settings);
break;
case PROP_CANCELLABLE:
g_value_set_object (value, priv->cancellable);
break;
@ -257,11 +245,6 @@ net_object_set_property (GObject *object_,
if (priv->client)
g_object_add_weak_pointer (G_OBJECT (priv->client), (gpointer *) (&priv->client));
break;
case PROP_REMOTE_SETTINGS:
priv->remote_settings = g_value_get_pointer (value);
if (priv->remote_settings)
g_object_add_weak_pointer (G_OBJECT (priv->remote_settings), (gpointer *) (&priv->remote_settings));
break;
case PROP_CANCELLABLE:
g_assert (!priv->cancellable);
priv->cancellable = g_value_dup_object (value);
@ -291,8 +274,6 @@ net_object_finalize (GObject *object)
if (priv->client)
g_object_remove_weak_pointer (G_OBJECT (priv->client), (gpointer *) (&priv->client));
if (priv->remote_settings)
g_object_remove_weak_pointer (G_OBJECT (priv->remote_settings), (gpointer *) (&priv->remote_settings));
if (priv->panel)
g_object_remove_weak_pointer (G_OBJECT (priv->panel), (gpointer *) (&priv->panel));
@ -327,10 +308,6 @@ net_object_class_init (NetObjectClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
g_object_class_install_property (object_class, PROP_CLIENT, pspec);
pspec = g_param_spec_pointer ("remote-settings", NULL, NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
g_object_class_install_property (object_class, PROP_REMOTE_SETTINGS, pspec);
pspec = g_param_spec_object ("cancellable", NULL, NULL,
G_TYPE_CANCELLABLE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);