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

network: Use g_clear_pointer

Browse source
This commit is contained in:
Robert Ancell 2019-10-23 09:38:55 +13:00
parent 8f722a31de
commit 6ab75da5c6
16 changed files with 47 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
panels/network/cc-wifi-hotspot-dialog.c
View file

@ -363,7 +363,7 @@ cc_wifi_hotspot_dialog_finalize (GObject *object)
{ {
CcWifiHotspotDialog *self = (CcWifiHotspotDialog *)object; CcWifiHotspotDialog *self = (CcWifiHotspotDialog *)object;
g_free (self->host_name); g_clear_pointer (&self->host_name, g_free);
g_clear_object (&self->device); g_clear_object (&self->device);
g_clear_object (&self->connection); g_clear_object (&self->connection);
@ -474,7 +474,7 @@ cc_wifi_hotspot_dialog_set_hostname (CcWifiHotspotDialog *self,
{ {
g_return_if_fail (CC_IS_WIFI_HOTSPOT_DIALOG (self)); g_return_if_fail (CC_IS_WIFI_HOTSPOT_DIALOG (self));
g_free (self->host_name); g_clear_pointer (&self->host_name, g_free);
self->host_name = g_strdup (host_name); self->host_name = g_strdup (host_name);
} }

9
panels/network/connection-editor/ce-page.c
View file

@ -78,11 +78,9 @@ finalize (GObject *object)
{ {
CEPage *self = CE_PAGE (object); CEPage *self = CE_PAGE (object);
g_free (self->title); g_clear_pointer (&self->title, g_free);
if (self->cancellable) {
g_cancellable_cancel (self->cancellable); g_cancellable_cancel (self->cancellable);
g_object_unref (self->cancellable); g_clear_object (&self->cancellable);
}
G_OBJECT_CLASS (ce_page_parent_class)->finalize (object); G_OBJECT_CLASS (ce_page_parent_class)->finalize (object);
} }
@ -150,8 +148,7 @@ set_property (GObject *object,
switch (prop_id) { switch (prop_id) {
case PROP_CONNECTION: case PROP_CONNECTION:
if (self->connection) g_clear_object (&self->connection);
g_object_unref (self->connection);
self->connection = g_value_dup_object (value); self->connection = g_value_dup_object (value);
break; break;
default: default:

7
panels/network/connection-editor/net-connection-editor.c
View file

@ -420,20 +420,17 @@ get_secrets_cb (GObject *source_object,
gpointer user_data) gpointer user_data)
{ {
NMRemoteConnection *connection; NMRemoteConnection *connection;
GetSecretsInfo *info = user_data; g_autofree GetSecretsInfo *info = user_data;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
g_autoptr(GVariant) variant = NULL; g_autoptr(GVariant) variant = NULL;
connection = NM_REMOTE_CONNECTION (source_object); connection = NM_REMOTE_CONNECTION (source_object);
variant = nm_remote_connection_get_secrets_finish (connection, res, &error); variant = nm_remote_connection_get_secrets_finish (connection, res, &error);
if (!variant && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { if (!variant && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_free (info);
return; return;
}
ce_page_complete_init (info->page, info->setting_name, variant, g_steal_pointer (&error)); ce_page_complete_init (info->page, info->setting_name, variant, g_steal_pointer (&error));
g_free (info);
} }
static void static void

2
panels/network/net-device-ethernet.c
View file

@ -551,7 +551,7 @@ device_ethernet_finalize (GObject *object)
{ {
NetDeviceEthernet *self = NET_DEVICE_ETHERNET (object); NetDeviceEthernet *self = NET_DEVICE_ETHERNET (object);
g_object_unref (self->builder); g_clear_object (&self->builder);
g_hash_table_destroy (self->connections); g_hash_table_destroy (self->connections);
G_OBJECT_CLASS (net_device_ethernet_parent_class)->finalize (object); G_OBJECT_CLASS (net_device_ethernet_parent_class)->finalize (object);

2
panels/network/net-device-simple.c
View file

@ -197,7 +197,7 @@ net_device_simple_finalize (GObject *object)
NetDeviceSimple *self = NET_DEVICE_SIMPLE (object); NetDeviceSimple *self = NET_DEVICE_SIMPLE (object);
NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self); NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self);
g_object_unref (priv->builder); g_clear_object (&priv->builder);
G_OBJECT_CLASS (net_device_simple_parent_class)->finalize (object); G_OBJECT_CLASS (net_device_simple_parent_class)->finalize (object);
} }

10
panels/network/net-device-wifi.c
View file

@ -970,16 +970,14 @@ net_device_wifi_finalize (GObject *object)
{ {
NetDeviceWifi *self = NET_DEVICE_WIFI (object); NetDeviceWifi *self = NET_DEVICE_WIFI (object);
if (self->cancellable) {
g_cancellable_cancel (self->cancellable); g_cancellable_cancel (self->cancellable);
g_clear_object (&self->cancellable); g_clear_object (&self->cancellable);
}
disable_scan_timeout (self); disable_scan_timeout (self);
g_object_unref (self->builder); g_clear_object (&self->builder);
g_free (self->selected_ssid_title); g_clear_pointer (&self->selected_ssid_title, g_free);
g_free (self->selected_connection_id); g_clear_pointer (&self->selected_connection_id, g_free);
g_free (self->selected_ap_id); g_clear_pointer (&self->selected_ap_id, g_free);
G_OBJECT_CLASS (net_device_wifi_parent_class)->finalize (object); G_OBJECT_CLASS (net_device_wifi_parent_class)->finalize (object);
} }

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

@ -252,8 +252,8 @@ net_object_finalize (GObject *object)
NetObject *self = NET_OBJECT (object); NetObject *self = NET_OBJECT (object);
NetObjectPrivate *priv = net_object_get_instance_private (self); NetObjectPrivate *priv = net_object_get_instance_private (self);
g_free (priv->id); g_clear_pointer (&priv->id, g_free);
g_free (priv->title); g_clear_pointer (&priv->title, g_free);
g_clear_object (&priv->cancellable); g_clear_object (&priv->cancellable);
if (priv->client) if (priv->client)

14
panels/network/net-vpn.c
View file

@ -334,22 +334,18 @@ net_vpn_finalize (GObject *object)
NetVpn *self = NET_VPN (object); NetVpn *self = NET_VPN (object);
NMClient *client = net_object_get_client (NET_OBJECT (object)); NMClient *client = net_object_get_client (NET_OBJECT (object));
if (client) { if (client)
g_signal_handlers_disconnect_by_func (client, g_signal_handlers_disconnect_by_func (client,
nm_active_connections_changed, nm_active_connections_changed,
self); self);
} if (self->active_connection)
if (self->active_connection) {
g_signal_handlers_disconnect_by_func (self->active_connection, g_signal_handlers_disconnect_by_func (self->active_connection,
nm_device_refresh_vpn_ui, nm_device_refresh_vpn_ui,
self); self);
g_object_unref (self->active_connection);
}
g_object_unref (self->connection);
g_free (self->service_type);
g_clear_object (&self->active_connection);
g_clear_object (&self->connection);
g_clear_pointer (&self->service_type, g_free);
g_clear_object (&self->builder); g_clear_object (&self->builder);
G_OBJECT_CLASS (net_vpn_parent_class)->finalize (object); G_OBJECT_CLASS (net_vpn_parent_class)->finalize (object);

6
panels/network/network-dialogs.c
View file

@ -40,8 +40,8 @@ wireless_dialog_closure_closure_notify (gpointer data,
GClosure *gclosure) GClosure *gclosure)
{ {
WirelessDialogClosure *closure = data; WirelessDialogClosure *closure = data;
g_object_unref (closure->client);
g_clear_object (&closure->client);
g_slice_free (WirelessDialogClosure, data); g_slice_free (WirelessDialogClosure, data);
} }
@ -49,9 +49,9 @@ static void
mobile_dialog_closure_free (gpointer data) mobile_dialog_closure_free (gpointer data)
{ {
MobileDialogClosure *closure = data; MobileDialogClosure *closure = data;
g_object_unref (closure->client);
g_object_unref (closure->device);
g_clear_object (&closure->client);
g_clear_object (&closure->device);
g_slice_free (MobileDialogClosure, data); g_slice_free (MobileDialogClosure, data);
} }

6
panels/network/wireless-security/eap-method-fast.c
View file

@ -56,8 +56,7 @@ destroy (EAPMethod *parent)
{ {
EAPMethodFAST *self = (EAPMethodFAST *) parent; EAPMethodFAST *self = (EAPMethodFAST *) parent;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
} }
static gboolean static gboolean
@ -96,8 +95,7 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
GtkTreeIter iter; GtkTreeIter iter;
g_autoptr(EAPMethod) eap = NULL; g_autoptr(EAPMethod) eap = NULL;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
self->size_group = g_object_ref (group); self->size_group = g_object_ref (group);
gtk_size_group_add_widget (group, GTK_WIDGET (self->anon_identity_label)); gtk_size_group_add_widget (group, GTK_WIDGET (self->anon_identity_label));

6
panels/network/wireless-security/eap-method-peap.c
View file

@ -56,8 +56,7 @@ destroy (EAPMethod *parent)
{ {
EAPMethodPEAP *self = (EAPMethodPEAP *) parent; EAPMethodPEAP *self = (EAPMethodPEAP *) parent;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
} }
static gboolean static gboolean
@ -105,8 +104,7 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
GtkTreeIter iter; GtkTreeIter iter;
g_autoptr(EAPMethod) eap = NULL; g_autoptr(EAPMethod) eap = NULL;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
self->size_group = g_object_ref (group); self->size_group = g_object_ref (group);
gtk_size_group_add_widget (group, GTK_WIDGET (self->ca_cert_not_required_check)); gtk_size_group_add_widget (group, GTK_WIDGET (self->ca_cert_not_required_check));

6
panels/network/wireless-security/eap-method-ttls.c
View file

@ -56,8 +56,7 @@ destroy (EAPMethod *parent)
{ {
EAPMethodTTLS *self = (EAPMethodTTLS *) parent; EAPMethodTTLS *self = (EAPMethodTTLS *) parent;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
} }
static gboolean static gboolean
@ -105,8 +104,7 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
GtkTreeIter iter; GtkTreeIter iter;
g_autoptr(EAPMethod) eap = NULL; g_autoptr(EAPMethod) eap = NULL;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
self->size_group = g_object_ref (group); self->size_group = g_object_ref (group);
gtk_size_group_add_widget (group, GTK_WIDGET (self->ca_cert_not_required_check)); gtk_size_group_add_widget (group, GTK_WIDGET (self->ca_cert_not_required_check));

6
panels/network/wireless-security/eap-method.c
View file

@ -200,10 +200,8 @@ eap_method_unref (EAPMethod *self)
if (self->destroy) if (self->destroy)
self->destroy (self); self->destroy (self);
if (self->builder) g_clear_object (&self->builder);
g_object_unref (self->builder); g_clear_object (&self->ui_widget);
if (self->ui_widget)
g_object_unref (self->ui_widget);
g_slice_free1 (self->obj_size, self); g_slice_free1 (self->obj_size, self);
} }

19
panels/network/wireless-security/wireless-security.c
View file

@ -160,14 +160,13 @@ wireless_security_unref (WirelessSecurity *self)
if (priv->destroy) if (priv->destroy)
priv->destroy (self); priv->destroy (self);
g_free (priv->username); if (priv->password)
if (priv->password) {
memset (priv->password, 0, strlen (priv->password)); memset (priv->password, 0, strlen (priv->password));
g_free (priv->password);
}
if (self->builder) g_clear_pointer (&priv->username, g_free);
g_object_unref (self->builder); g_clear_pointer (&priv->password, g_free);
g_clear_object (&self->builder);
g_slice_free1 (priv->obj_size, self); g_slice_free1 (priv->obj_size, self);
g_free (priv); g_free (priv);
} }
@ -306,13 +305,13 @@ wireless_security_set_userpass (WirelessSecurity *self,
{ {
WirelessSecurityPrivate *priv = self->priv; WirelessSecurityPrivate *priv = self->priv;
g_free (priv->username); g_clear_pointer (&priv->username, g_free);
priv->username = g_strdup (user); priv->username = g_strdup (user);
if (priv->password) { if (priv->password)
memset (priv->password, 0, strlen (priv->password)); memset (priv->password, 0, strlen (priv->password));
g_free (priv->password);
} g_clear_pointer (&priv->password, g_free);
priv->password = g_strdup (password); priv->password = g_strdup (password);
if (always_ask != (gboolean) -1) if (always_ask != (gboolean) -1)

6
panels/network/wireless-security/ws-dynamic-wep.c
View file

@ -45,8 +45,7 @@ destroy (WirelessSecurity *parent)
{ {
WirelessSecurityDynamicWEP *self = (WirelessSecurityDynamicWEP *) parent; WirelessSecurityDynamicWEP *self = (WirelessSecurityDynamicWEP *) parent;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
} }
static GtkWidget * static GtkWidget *
@ -68,8 +67,7 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
{ {
WirelessSecurityDynamicWEP *self = (WirelessSecurityDynamicWEP *) parent; WirelessSecurityDynamicWEP *self = (WirelessSecurityDynamicWEP *) parent;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
self->size_group = g_object_ref (group); self->size_group = g_object_ref (group);
ws_802_1x_add_to_size_group (self->size_group, self->auth_label, self->auth_combo); ws_802_1x_add_to_size_group (self->size_group, self->auth_label, self->auth_combo);

6
panels/network/wireless-security/ws-wpa-eap.c
View file

@ -46,8 +46,7 @@ destroy (WirelessSecurity *parent)
{ {
WirelessSecurityWPAEAP *self = (WirelessSecurityWPAEAP *) parent; WirelessSecurityWPAEAP *self = (WirelessSecurityWPAEAP *) parent;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
} }
static GtkWidget * static GtkWidget *
@ -69,8 +68,7 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
{ {
WirelessSecurityWPAEAP *self = (WirelessSecurityWPAEAP *) parent; WirelessSecurityWPAEAP *self = (WirelessSecurityWPAEAP *) parent;
if (self->size_group) g_clear_object (&self->size_group);
g_object_unref (self->size_group);
self->size_group = g_object_ref (group); self->size_group = g_object_ref (group);
ws_802_1x_add_to_size_group (self->size_group, self->auth_label, self->auth_combo); ws_802_1x_add_to_size_group (self->size_group, self->auth_label, self->auth_combo);