[gnome-control-center/gbsneto/revert-non-hardware-proxies: 7/7] Revert "color: Cache D-Bus proxies"

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 7d58972623d5f84114ed58ff1cbe4836e6abe0ec
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sun Aug 26 23:52:18 2018 -0300

    Revert "color: Cache D-Bus proxies"
    
    This reverts commit 8e56ea35f38898deb3b5858211c64ba2ce0e0e93.

 panels/color/cc-color-calibrate.c | 32 ++++++++++++++++----------------
 panels/color/cc-color-panel.c     |  1 +
 2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/panels/color/cc-color-calibrate.c b/panels/color/cc-color-calibrate.c
index ea1187c6c..3861213b2 100644
--- a/panels/color/cc-color-calibrate.c
+++ b/panels/color/cc-color-calibrate.c
@@ -28,8 +28,6 @@
 #include <math.h>
 #include <colord-session/cd-session.h>
 
-#include "shell/cc-object-storage.h"
-
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome-desktop/gnome-rr.h>
 
@@ -842,13 +840,14 @@ cc_color_calibrate_setup (CcColorCalibrate *calibrate,
   g_return_val_if_fail (calibrate->device_kind != CD_SENSOR_CAP_UNKNOWN, FALSE);
 
   /* use logind to disable system state idle */
-  calibrate->proxy_inhibit = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SYSTEM,
-                                                                      G_DBUS_PROXY_FLAGS_NONE,
-                                                                      "org.freedesktop.login1",
-                                                                      "/org/freedesktop/login1",
-                                                                      "org.freedesktop.login1.Manager",
-                                                                      NULL,
-                                                                      error);
+  calibrate->proxy_inhibit = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                                            G_DBUS_PROXY_FLAGS_NONE,
+                                                            NULL,
+                                                            "org.freedesktop.login1",
+                                                            "/org/freedesktop/login1",
+                                                            "org.freedesktop.login1.Manager",
+                                                            NULL,
+                                                            error);
   if (calibrate->proxy_inhibit == NULL)
     {
       ret = FALSE;
@@ -856,13 +855,14 @@ cc_color_calibrate_setup (CcColorCalibrate *calibrate,
     }
 
   /* start the calibration session daemon */
-  calibrate->proxy_helper = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
-                                                                     G_DBUS_PROXY_FLAGS_NONE,
-                                                                     CD_SESSION_DBUS_SERVICE,
-                                                                     CD_SESSION_DBUS_PATH,
-                                                                     CD_SESSION_DBUS_INTERFACE_DISPLAY,
-                                                                     NULL,
-                                                                     error);
+  calibrate->proxy_helper = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                           G_DBUS_PROXY_FLAGS_NONE,
+                                                           NULL,
+                                                           CD_SESSION_DBUS_SERVICE,
+                                                           CD_SESSION_DBUS_PATH,
+                                                           CD_SESSION_DBUS_INTERFACE_DISPLAY,
+                                                           NULL,
+                                                           error);
   if (calibrate->proxy_helper == NULL)
     {
       ret = FALSE;
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index 0cb9227b0..2a30f35d5 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -44,6 +44,7 @@ struct _CcColorPanel
   GPtrArray     *devices;
   GPtrArray     *sensors;
   GCancellable  *cancellable;
+  GDBusProxy    *proxy;
   GSettings     *settings;
   GSettings     *settings_colord;
   GtkWidget     *assistant_calib;