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

network: Remove NetObject id property

Browse source 
This is better handled by comparing objects.
This commit is contained in:
Robert Ancell 2019-10-23 12:45:07 +13:00
parent 696e2c7617
commit c74d26bf3a
15 changed files with 76 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,6 @@
typedef struct
{
gchar *id;
gchar *title;
GCancellable *cancellable;
NMClient *client;
@ -36,7 +35,6 @@ typedef struct
enum {
PROP_0,
PROP_ID,
PROP_TITLE,
PROP_CLIENT,
PROP_CANCELLABLE,
@ -55,43 +53,17 @@ G_DEFINE_TYPE_WITH_PRIVATE (NetObject, net_object, G_TYPE_OBJECT)
void
net_object_emit_changed (NetObject *self)
{
NetObjectPrivate *priv = net_object_get_instance_private (self);
g_return_if_fail (NET_IS_OBJECT (self));
g_debug ("NetObject: %s emit 'changed'", priv->id);
g_signal_emit (self, signals[SIGNAL_CHANGED], 0);
}
void
net_object_emit_removed (NetObject *self)
{
NetObjectPrivate *priv = net_object_get_instance_private (self);
g_return_if_fail (NET_IS_OBJECT (self));
g_debug ("NetObject: %s emit 'removed'", priv->id);
g_signal_emit (self, signals[SIGNAL_REMOVED], 0);
}
const gchar *
net_object_get_id (NetObject *self)
{
NetObjectPrivate *priv = net_object_get_instance_private (self);
g_return_val_if_fail (NET_IS_OBJECT (self), NULL);
return priv->id;
}
void
net_object_set_id (NetObject *self, const gchar *id)
{
NetObjectPrivate *priv = net_object_get_instance_private (self);
g_return_if_fail (NET_IS_OBJECT (self));
g_clear_pointer (&priv->id, g_free);
priv->id = g_strdup (id);
g_object_notify (G_OBJECT (self), "id");
}
const gchar *
net_object_get_title (NetObject *self)
{
@ -160,9 +132,6 @@ net_object_get_property (GObject *object,
NetObjectPrivate *priv = net_object_get_instance_private (self);
switch (prop_id) {
case PROP_ID:
g_value_set_string (value, priv->id);
break;
case PROP_TITLE:
g_value_set_string (value, priv->title);
break;
@ -191,10 +160,6 @@ net_object_set_property (GObject *object,
NetObjectPrivate *priv = net_object_get_instance_private (self);
switch (prop_id) {
case PROP_ID:
g_free (priv->id);
priv->id = g_strdup (g_value_get_string (value));
break;
case PROP_TITLE:
g_free (priv->title);
priv->title = g_strdup (g_value_get_string (value));
@ -220,7 +185,6 @@ net_object_finalize (GObject *object)
NetObject *self = NET_OBJECT (object);
NetObjectPrivate *priv = net_object_get_instance_private (self);
g_clear_pointer (&priv->id, g_free);
g_clear_pointer (&priv->title, g_free);
g_clear_object (&priv->cancellable);
@ -239,11 +203,6 @@ net_object_class_init (NetObjectClass *klass)
object_class->get_property = net_object_get_property;
object_class->set_property = net_object_set_property;
pspec = g_param_spec_string ("id", NULL, NULL,
NULL,
G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_ID, pspec);
pspec = g_param_spec_string ("title", NULL, NULL,
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);