[gnome-settings-daemon] color: Fix a crash when cancelling loading profiles
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] color: Fix a crash when cancelling loading profiles
- Date: Tue, 15 Mar 2016 23:35:48 +0000 (UTC)
commit c41c90ae014b61a7dce12ee1886035e95e997725
Author: Richard Hughes <richard hughsie com>
Date: Tue Mar 15 15:37:54 2016 +0000
color: Fix a crash when cancelling loading profiles
https://bugzilla.gnome.org/show_bug.cgi?id=763382
plugins/color/gsd-color-profiles.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/plugins/color/gsd-color-profiles.c b/plugins/color/gsd-color-profiles.c
index fa13605..36f0015 100644
--- a/plugins/color/gsd-color-profiles.c
+++ b/plugins/color/gsd-color-profiles.c
@@ -57,11 +57,11 @@ gcm_session_client_connect_cb (GObject *source_object,
{
gboolean ret;
GError *error = NULL;
- GsdColorProfiles *profiles = GSD_COLOR_PROFILES (user_data);
- GsdColorProfilesPrivate *priv = profiles->priv;
+ CdClient *client = CD_CLIENT (source_object);
+ GsdColorProfiles *profiles;
/* connected */
- ret = cd_client_connect_finish (profiles->priv->client, res, &error);
+ ret = cd_client_connect_finish (client, res, &error);
if (!ret) {
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning ("failed to connect to colord: %s", error->message);
@@ -70,6 +70,7 @@ gcm_session_client_connect_cb (GObject *source_object,
}
/* is there an available colord instance? */
+ profiles = GSD_COLOR_PROFILES (user_data);
ret = cd_client_get_has_server (profiles->priv->client);
if (!ret) {
g_warning ("There is no colord server available");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]