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

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

commit a44d3958046a0634948861c748d5561e46f4c1b1
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sun Aug 26 23:47:46 2018 -0300

    Revert "privacy: Cache D-Bus proxies"
    
    This reverts commit 754434fa0dab020046ff4a198ba259c3b6d6d7d5.

 panels/privacy/cc-privacy-panel.c | 41 ++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
index a477aa567..27f0826e4 100644
--- a/panels/privacy/cc-privacy-panel.c
+++ b/panels/privacy/cc-privacy-panel.c
@@ -18,7 +18,6 @@
  * Author: Matthias Clasen <mclasen redhat com>
  */
 
-#include "shell/cc-object-storage.h"
 #include "list-box-helper.h"
 #include "cc-privacy-panel.h"
 #include "cc-privacy-resources.h"
@@ -465,7 +464,7 @@ on_gclue_manager_ready (GObject *source_object,
   GDBusProxy *proxy;
   GError *error = NULL;
 
-  proxy = cc_object_storage_create_dbus_proxy_finish (res, &error);
+  proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
   if (proxy == NULL)
     {
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@@ -782,7 +781,7 @@ on_perm_store_ready (GObject *source_object,
   GVariant *params;
   GError *error = NULL;
 
-  proxy = cc_object_storage_create_dbus_proxy_finish (res, &error);
+  proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
   if (proxy == NULL)
     {
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@@ -840,23 +839,25 @@ add_location (CcPrivacyPanel *self)
                                                        g_free,
                                                        g_object_unref);
 
-  cc_object_storage_create_dbus_proxy (G_BUS_TYPE_SYSTEM,
-                                       G_DBUS_PROXY_FLAGS_NONE,
-                                       "org.freedesktop.GeoClue2",
-                                       "/org/freedesktop/GeoClue2/Manager",
-                                       "org.freedesktop.GeoClue2.Manager",
-                                       self->cancellable,
-                                       on_gclue_manager_ready,
-                                       self);
-
-  cc_object_storage_create_dbus_proxy (G_BUS_TYPE_SESSION,
-                                       G_DBUS_PROXY_FLAGS_NONE,
-                                       "org.freedesktop.impl.portal.PermissionStore",
-                                       "/org/freedesktop/impl/portal/PermissionStore",
-                                       "org.freedesktop.impl.portal.PermissionStore",
-                                       self->cancellable,
-                                       on_perm_store_ready,
-                                       self);
+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+                            G_DBUS_PROXY_FLAGS_NONE,
+                            NULL,
+                            "org.freedesktop.GeoClue2",
+                            "/org/freedesktop/GeoClue2/Manager",
+                            "org.freedesktop.GeoClue2.Manager",
+                            self->cancellable,
+                            on_gclue_manager_ready,
+                            self);
+
+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                            G_DBUS_PROXY_FLAGS_NONE,
+                            NULL,
+                            "org.freedesktop.impl.portal.PermissionStore",
+                            "/org/freedesktop/impl/portal/PermissionStore",
+                            "org.freedesktop.impl.portal.PermissionStore",
+                            self->cancellable,
+                            on_perm_store_ready,
+                            self);
 }
 
 static void