From e46d505182c087858ecf52609c3802be5d285dfe Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Tue, 27 Mar 2018 18:01:44 -0300
Subject: [PATCH] info: Cache D-Bus proxies

---
 panels/info/cc-info-overview-panel.c | 42 +++++++++++++---------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
index 411c1c905..4301090f9 100644
--- a/panels/info/cc-info-overview-panel.c
+++ b/panels/info/cc-info-overview-panel.c
@@ -22,6 +22,7 @@
 #include <config.h>
 
 #include "shell/cc-hostname-entry.h"
+#include "shell/cc-object-storage.h"
 
 #include "cc-info-resources.h"
 #include "info-cleanup.h"
@@ -235,13 +236,12 @@ get_renderer_from_session (void)
   char *renderer;
   g_autoptr(GError) error = NULL;
 
-  session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-                                                 G_DBUS_PROXY_FLAGS_NONE,
-                                                 NULL,
-                                                 "org.gnome.SessionManager",
-                                                 "/org/gnome/SessionManager",
-                                                 "org.gnome.SessionManager",
-                                                 NULL, &error);
+  session_proxy = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
+                                                            G_DBUS_PROXY_FLAGS_NONE,
+                                                            "org.gnome.SessionManager",
+                                                            "/org/gnome/SessionManager",
+                                                            "org.gnome.SessionManager",
+                                                            NULL, &error);
   if (error != NULL)
     {
       g_warning ("Unable to connect to create a proxy for org.gnome.SessionManager: %s",
@@ -302,13 +302,12 @@ has_dual_gpu (void)
   gboolean ret;
   g_autoptr(GError) error = NULL;
 
-  switcheroo_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                                    G_DBUS_PROXY_FLAGS_NONE,
-                                                    NULL,
-                                                    "net.hadess.SwitcherooControl",
-                                                    "/net/hadess/SwitcherooControl",
-                                                    "net.hadess.SwitcherooControl",
-                                                    NULL, &error);
+  switcheroo_proxy = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SYSTEM,
+                                                               G_DBUS_PROXY_FLAGS_NONE,
+                                                               "net.hadess.SwitcherooControl",
+                                                               "/net/hadess/SwitcherooControl",
+                                                               "net.hadess.SwitcherooControl",
+                                                               NULL, &error);
   if (switcheroo_proxy == NULL)
     {
       g_debug ("Unable to connect to create a proxy for net.hadess.SwitcherooControl: %s",
@@ -720,14 +719,13 @@ info_overview_panel_setup_virt (CcInfoOverviewPanel *self)
   g_autoptr(GVariant) variant = NULL;
   GVariant *inner;
 
-  systemd_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                                 G_DBUS_PROXY_FLAGS_NONE,
-                                                 NULL,
-                                                 "org.freedesktop.systemd1",
-                                                 "/org/freedesktop/systemd1",
-                                                 "org.freedesktop.systemd1",
-                                                 NULL,
-                                                 &error);
+  systemd_proxy = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SYSTEM,
+                                                            G_DBUS_PROXY_FLAGS_NONE,
+                                                            "org.freedesktop.systemd1",
+                                                            "/org/freedesktop/systemd1",
+                                                            "org.freedesktop.systemd1",
+                                                            NULL,
+                                                            &error);
 
   if (systemd_proxy == NULL)
     {