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

network: Add a GCancellable property to NetObject for future use

Browse source
This commit is contained in:
Richard Hughes 2012-07-16 17:14:01 +01:00
parent 7fcc4666ac
commit b48fc1b65c
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ struct _NetObjectPrivate
gchar *id; gchar *id;
gchar *title; gchar *title;
gboolean removable; gboolean removable;
GCancellable *cancellable;
NMClient *client; NMClient *client;
}; };
@ -42,6 +43,7 @@ enum {
PROP_TITLE, PROP_TITLE,
PROP_REMOVABLE, PROP_REMOVABLE,
PROP_CLIENT, PROP_CLIENT,
PROP_CANCELLABLE,
PROP_LAST PROP_LAST
}; };
@ -126,6 +128,13 @@ net_object_set_client (NetObject *object, NMClient *client)
object->priv->client = g_object_ref (client); object->priv->client = g_object_ref (client);
} }
GCancellable *
net_object_get_cancellable (NetObject *object)
{
g_return_val_if_fail (NET_IS_OBJECT (object), NULL);
return object->priv->cancellable;
}
GtkWidget * GtkWidget *
net_object_add_to_notebook (NetObject *object, net_object_add_to_notebook (NetObject *object,
GtkNotebook *notebook, GtkNotebook *notebook,
@ -187,6 +196,9 @@ net_object_get_property (GObject *object_,
case PROP_CLIENT: case PROP_CLIENT:
g_value_set_object (value, priv->client); g_value_set_object (value, priv->client);
break; break;
case PROP_CANCELLABLE:
g_value_set_object (value, priv->cancellable);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -222,6 +234,9 @@ net_object_set_property (GObject *object_,
g_object_unref (priv->client); g_object_unref (priv->client);
priv->client = g_object_ref (g_value_get_object (value)); priv->client = g_object_ref (g_value_get_object (value));
break; break;
case PROP_CANCELLABLE:
priv->cancellable = g_value_dup_object (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -238,7 +253,8 @@ net_object_finalize (GObject *object)
g_free (priv->title); g_free (priv->title);
if (priv->client != NULL) if (priv->client != NULL)
g_object_unref (priv->client); g_object_unref (priv->client);
if (priv->cancellable != NULL)
g_object_unref (priv->cancellable);
G_OBJECT_CLASS (net_object_parent_class)->finalize (object); G_OBJECT_CLASS (net_object_parent_class)->finalize (object);
} }
@ -271,6 +287,11 @@ net_object_class_init (NetObjectClass *klass)
G_PARAM_READWRITE); G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_CLIENT, pspec); g_object_class_install_property (object_class, PROP_CLIENT, pspec);
pspec = g_param_spec_object ("cancellable", NULL, NULL,
G_TYPE_CANCELLABLE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
g_object_class_install_property (object_class, PROP_CANCELLABLE, pspec);
signals[SIGNAL_CHANGED] = signals[SIGNAL_CHANGED] =
g_signal_new ("changed", g_signal_new ("changed",
G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,

1
panels/network/net-object.h
View file

@ -72,6 +72,7 @@ void net_object_set_title (NetObject *object,
NMClient *net_object_get_client (NetObject *object); NMClient *net_object_get_client (NetObject *object);
void net_object_set_client (NetObject *object, void net_object_set_client (NetObject *object,
NMClient *client); NMClient *client);
GCancellable *net_object_get_cancellable (NetObject *object);
void net_object_emit_changed (NetObject *object); void net_object_emit_changed (NetObject *object);
void net_object_emit_removed (NetObject *object); void net_object_emit_removed (NetObject *object);
void net_object_delete (NetObject *object); void net_object_delete (NetObject *object);