diff options
| author | Halton Huo <halton.huo@sun.com> | 2010-01-28 13:55:02 +0800 |
|---|---|---|
| committer | Halton Huo <halton.huo@sun.com> | 2010-01-28 13:55:02 +0800 |
| commit | 6cc56ebae4a199c222a4c5f0d10c3025f58a9307 (patch) | |
| tree | b505b349bc6c157797c502d507f8c0eaccb5a7b2 | |
| parent | 13468c1ea97a9a2dba106b6b666400e664275d7c (diff) | |
| download | gdm-6cc56ebae4a199c222a4c5f0d10c3025f58a9307.tar.gz | |
Revert name proxy_hal to proxy, use proxy_ck in disconnect_from_ck()
| -rw-r--r-- | daemon/gdm-local-display-factory.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index 6512f9b3..27370fd9 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -69,7 +69,7 @@ struct GdmLocalDisplayFactoryPrivate { DBusGConnection *connection; - DBusGProxy *proxy_hal; + DBusGProxy *proxy; DBusGProxy *proxy_ck; GHashTable *displays; GHashTable *displays_by_session; @@ -1024,11 +1024,11 @@ register_factory (GdmLocalDisplayFactory *factory) static gboolean connect_to_hal (GdmLocalDisplayFactory *factory) { - factory->priv->proxy_hal = dbus_g_proxy_new_for_name (factory->priv->connection, - HAL_DBUS_NAME, - HAL_DBUS_MANAGER_PATH, - HAL_DBUS_MANAGER_INTERFACE); - if (factory->priv->proxy_hal == NULL) { + factory->priv->proxy = dbus_g_proxy_new_for_name (factory->priv->connection, + HAL_DBUS_NAME, + HAL_DBUS_MANAGER_PATH, + HAL_DBUS_MANAGER_INTERFACE); + if (factory->priv->proxy == NULL) { g_warning ("Couldn't create proxy for HAL Manager"); return FALSE; } @@ -1039,8 +1039,8 @@ connect_to_hal (GdmLocalDisplayFactory *factory) static void disconnect_from_hal (GdmLocalDisplayFactory *factory) { - if (factory->priv->proxy_hal == NULL) { - g_object_unref (factory->priv->proxy_hal); + if (factory->priv->proxy == NULL) { + g_object_unref (factory->priv->proxy); } } @@ -1080,8 +1080,8 @@ connect_to_ck (GdmLocalDisplayFactory *factory) static void disconnect_from_ck (GdmLocalDisplayFactory *factory) { - if (factory->priv->proxy_hal == NULL) { - g_object_unref (factory->priv->proxy_hal); + if (factory->priv->proxy_ck == NULL) { + g_object_unref (factory->priv->proxy_ck); } } |