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

night-light-dialog: Ignore G_IO_ERROR_CANCELLED errors

Browse source 
We should ignore G_IO_ERROR_CANCELLED errors and avoid displaying useless
warnings. Also use g_clear_object instead of g_object_unref.

Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/87
This commit is contained in:
Andrea Azzarone 2018-05-07 17:01:20 +02:00 • committed by Georges Basile Stavracas Neto
parent f3257ce82a
commit f9b65046e9
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
panels/display/cc-night-light-dialog.c
View file

@ -79,11 +79,11 @@ cc_night_light_dialog_finalize (GObject *object)
self->main_window = NULL;
}
g_object_unref (self->builder);
g_object_unref (self->proxy_color);
g_object_unref (self->proxy_color_props);
g_object_unref (self->settings_display);
g_object_unref (self->settings_clock);
g_clear_object (&self->builder);
g_clear_object (&self->proxy_color);
g_clear_object (&self->proxy_color_props);
g_clear_object (&self->settings_display);
g_clear_object (&self->settings_clock);
if (self->timer_id > 0)
g_source_remove (self->timer_id);
@ -392,7 +392,8 @@ dialog_got_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_da
proxy = cc_object_storage_create_dbus_proxy_finish (res, &error);
if (proxy == NULL)
{
g_warning ("failed to connect to g-s-d: %s", error->message);
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning ("failed to connect to g-s-d: %s", error->message);
return;
}
@ -414,7 +415,8 @@ dialog_got_proxy_props_cb (GObject *source_object, GAsyncResult *res, gpointer u
proxy = cc_object_storage_create_dbus_proxy_finish (res, &error);
if (proxy == NULL)
{
g_warning ("failed to connect to g-s-d: %s", error->message);
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning ("failed to connect to g-s-d: %s", error->message);
return;
}