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

Simplify use of GCancellable

Browse source 
g_cancellable_cancell can be called without checking for a NULL value.
Use g_clear_object instead of g_object_unref
This commit is contained in:
Robert Ancell 2018-05-31 10:16:54 +12:00 • committed by Georges Basile Stavracas Neto
parent dd61d98ec5
commit a64ef75ad7
9 changed files with 23 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

1
panels/color/cc-color-panel.c
View file

@ -1954,7 +1954,6 @@ cc_color_panel_dispose (GObject *object)
g_clear_pointer (&prefs->devices, g_ptr_array_unref); g_clear_pointer (&prefs->devices, g_ptr_array_unref);
} }
if (prefs->cancellable != NULL)
g_cancellable_cancel (prefs->cancellable); g_cancellable_cancel (prefs->cancellable);
g_clear_object (&prefs->settings); g_clear_object (&prefs->settings);
g_clear_object (&prefs->settings_colord); g_clear_object (&prefs->settings_colord);

1
panels/network/cc-network-panel.c
View file

@ -210,7 +210,6 @@ cc_network_panel_dispose (GObject *object)
{ {
CcNetworkPanel *self = CC_NETWORK_PANEL (object); CcNetworkPanel *self = CC_NETWORK_PANEL (object);
if (self->cancellable != NULL)
g_cancellable_cancel (self->cancellable); g_cancellable_cancel (self->cancellable);
g_clear_object (&self->cancellable); g_clear_object (&self->cancellable);

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

@ -267,8 +267,7 @@ net_object_finalize (GObject *object)
g_free (priv->id); g_free (priv->id);
g_free (priv->title); g_free (priv->title);
if (priv->cancellable != NULL) g_clear_object (&priv->cancellable);
g_object_unref (priv->cancellable);
if (priv->client) if (priv->client)
g_object_remove_weak_pointer (G_OBJECT (priv->client), (gpointer *) (&priv->client)); g_object_remove_weak_pointer (G_OBJECT (priv->client), (gpointer *) (&priv->client));

9
panels/printers/pp-details-dialog.c
View file

@ -462,18 +462,11 @@ pp_details_dialog_free (PpDetailsDialog *self)
self->all_ppds_list = NULL; self->all_ppds_list = NULL;
} }
if (self->get_all_ppds_cancellable != NULL)
{
g_cancellable_cancel (self->get_all_ppds_cancellable); g_cancellable_cancel (self->get_all_ppds_cancellable);
g_clear_object (&self->get_all_ppds_cancellable); g_clear_object (&self->get_all_ppds_cancellable);
}
if (self->get_ppd_names_cancellable != NULL)
{
g_cancellable_cancel (self->get_ppd_names_cancellable); g_cancellable_cancel (self->get_ppd_names_cancellable);
g_object_unref (self->get_ppd_names_cancellable); g_clear_object (&self->get_ppd_names_cancellable);
self->get_ppd_names_cancellable = NULL;
}
gtk_widget_destroy (GTK_WIDGET (self)); gtk_widget_destroy (GTK_WIDGET (self));
} }

6
panels/printers/pp-jobs-dialog.c
View file

@ -421,12 +421,9 @@ update_jobs_list (PpJobsDialog *dialog)
PpPrinter *printer; PpPrinter *printer;
if (dialog->printer_name != NULL) if (dialog->printer_name != NULL)
{
if (dialog->get_jobs_cancellable != NULL)
{ {
g_cancellable_cancel (dialog->get_jobs_cancellable); g_cancellable_cancel (dialog->get_jobs_cancellable);
g_clear_object (&dialog->get_jobs_cancellable); g_clear_object (&dialog->get_jobs_cancellable);
}
dialog->get_jobs_cancellable = g_cancellable_new (); dialog->get_jobs_cancellable = g_cancellable_new ();
@ -663,12 +660,9 @@ pp_jobs_dialog_set_callback (PpJobsDialog *dialog,
void void
pp_jobs_dialog_free (PpJobsDialog *dialog) pp_jobs_dialog_free (PpJobsDialog *dialog)
{
if (dialog->get_jobs_cancellable != NULL)
{ {
g_cancellable_cancel (dialog->get_jobs_cancellable); g_cancellable_cancel (dialog->get_jobs_cancellable);
g_clear_object (&dialog->get_jobs_cancellable); g_clear_object (&dialog->get_jobs_cancellable);
}
gtk_widget_destroy (GTK_WIDGET (dialog->dialog)); gtk_widget_destroy (GTK_WIDGET (dialog->dialog));
dialog->dialog = NULL; dialog->dialog = NULL;

3
panels/printers/pp-new-printer-dialog.c
View file

@ -1573,11 +1573,8 @@ search_for_remote_printers (THostSearchData *data)
{ {
PpNewPrinterDialogPrivate *priv = data->dialog->priv; PpNewPrinterDialogPrivate *priv = data->dialog->priv;
if (priv->remote_host_cancellable != NULL)
{
g_cancellable_cancel (priv->remote_host_cancellable); g_cancellable_cancel (priv->remote_host_cancellable);
g_clear_object (&priv->remote_host_cancellable); g_clear_object (&priv->remote_host_cancellable);
}
priv->remote_host_cancellable = g_cancellable_new (); priv->remote_host_cancellable = g_cancellable_new ();

10
panels/printers/pp-printer-entry.c
View file

@ -623,11 +623,8 @@ pp_printer_entry_update_jobs_count (PpPrinterEntry *self)
{ {
PpPrinter *printer; PpPrinter *printer;
if (self->get_jobs_cancellable != NULL)
{
g_cancellable_cancel (self->get_jobs_cancellable); g_cancellable_cancel (self->get_jobs_cancellable);
g_clear_object (&self->get_jobs_cancellable); g_clear_object (&self->get_jobs_cancellable);
}
self->get_jobs_cancellable = g_cancellable_new (); self->get_jobs_cancellable = g_cancellable_new ();
@ -1009,17 +1006,12 @@ pp_printer_entry_dispose (GObject *object)
g_clear_pointer (&self->printer_make_and_model, g_free); g_clear_pointer (&self->printer_make_and_model, g_free);
g_clear_pointer (&self->printer_hostname, g_free); g_clear_pointer (&self->printer_hostname, g_free);
if (self->get_jobs_cancellable != NULL)
{
g_cancellable_cancel (self->get_jobs_cancellable); g_cancellable_cancel (self->get_jobs_cancellable);
g_clear_object (&self->get_jobs_cancellable); g_clear_object (&self->get_jobs_cancellable);
}
if (self->check_clean_heads_cancellable)
{
g_cancellable_cancel (self->check_clean_heads_cancellable); g_cancellable_cancel (self->check_clean_heads_cancellable);
g_clear_object (&self->check_clean_heads_cancellable); g_clear_object (&self->check_clean_heads_cancellable);
}
g_clear_object (&self->clean_command); g_clear_object (&self->clean_command);
G_OBJECT_CLASS (pp_printer_entry_parent_class)->dispose (object); G_OBJECT_CLASS (pp_printer_entry_parent_class)->dispose (object);

5
panels/search/cc-search-locations-dialog.c
View file

@ -74,12 +74,9 @@ cc_search_locations_dialog_init (CcSearchLocationsDialog *self)
static void static void
place_free (Place * p) place_free (Place * p)
{
if (p->cancellable != NULL)
{ {
g_cancellable_cancel (p->cancellable); g_cancellable_cancel (p->cancellable);
g_object_unref (p->cancellable); g_clear_object (&p->cancellable);
}
g_object_unref (p->location); g_object_unref (p->location);
g_free (p->display_name); g_free (p->display_name);

1
panels/search/cc-search-panel.c
View file

@ -663,7 +663,6 @@ cc_search_panel_dispose (GObject *object)
{ {
CcSearchPanel *self = CC_SEARCH_PANEL (object); CcSearchPanel *self = CC_SEARCH_PANEL (object);
if (self->load_cancellable != NULL)
g_cancellable_cancel (self->load_cancellable); g_cancellable_cancel (self->load_cancellable);
g_clear_object (&self->load_cancellable); g_clear_object (&self->load_cancellable);