[gdm/wip/wayland: 7/10] daemon: rename slave_bus_proxy to slave_proxy



commit 9f17f8ab30369a3f7b21dceb42724f15deda49d0
Author: Ray Strode <rstrode redhat com>
Date:   Tue Sep 17 18:48:32 2013 -0400

    daemon: rename slave_bus_proxy to slave_proxy
    
    The _bus_ middle part of the name was only there to prevent ambiguity
    with the, then named "gdm-slave-proxy", but now named, gdm-slave-job class.

 daemon/gdm-display.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 04b2950..902df50 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -73,7 +73,7 @@ struct GdmDisplayPrivate
 
         GdmSlaveJob          *slave_job;
         char                 *slave_bus_name;
-        GdmDBusSlave         *slave_bus_proxy;
+        GdmDBusSlave         *slave_proxy;
         int                   slave_name_id;
         GDBusConnection      *connection;
         GdmDisplayAccessFile *user_access_file;
@@ -309,13 +309,13 @@ gdm_display_real_set_slave_bus_name (GdmDisplay *display,
                                                                        g_object_ref (display),
                                                                        NULL);
 
-        g_clear_object (&display->priv->slave_bus_proxy);
-        display->priv->slave_bus_proxy = GDM_DBUS_SLAVE (gdm_dbus_slave_proxy_new_sync 
(display->priv->connection,
-                                                                                        
G_DBUS_PROXY_FLAGS_NONE,
-                                                                                        name,
-                                                                                        GDM_SLAVE_PATH,
-                                                                                        NULL, NULL));
-        g_object_bind_property (G_OBJECT (display->priv->slave_bus_proxy),
+        g_clear_object (&display->priv->slave_proxy);
+        display->priv->slave_proxy = GDM_DBUS_SLAVE (gdm_dbus_slave_proxy_new_sync 
(display->priv->connection,
+                                                                                    G_DBUS_PROXY_FLAGS_NONE,
+                                                                                    name,
+                                                                                    GDM_SLAVE_PATH,
+                                                                                    NULL, NULL));
+        g_object_bind_property (G_OBJECT (display->priv->slave_proxy),
                                 "session-id",
                                 G_OBJECT (display),
                                 "session-id",
@@ -665,7 +665,6 @@ gdm_display_prepare (GdmDisplay *display)
         return ret;
 }
 
-
 static gboolean
 gdm_display_real_manage (GdmDisplay *display)
 {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]