[gdm] daemon: Drop manager bus watching code
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] daemon: Drop manager bus watching code
- Date: Fri, 13 Jul 2012 19:27:00 +0000 (UTC)
commit 7f646470e16afeef3c3e23853daea0d6012118e8
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Sat Jul 7 16:40:48 2012 -0400
daemon: Drop manager bus watching code
GdmManager watches the system bus to see whenever a service
leaves. The intent of the code is to stop managing displays
associated with slaves that have disappeared.
The code wasn't ever finished, though, so drop it for now.
It will be easy to add back in a different way after GdmManager
has been ported to GDBus.
daemon/gdm-manager.c | 68 --------------------------------------------------
1 files changed, 0 insertions(+), 68 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 65f1318..59495e4 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -65,7 +65,6 @@ struct GdmManagerPrivate
gboolean wait_for_go;
gboolean no_console;
- DBusGProxy *bus_proxy;
DBusGConnection *connection;
};
@@ -199,57 +198,6 @@ gdm_manager_set_wait_for_go (GdmManager *manager,
}
}
-typedef struct {
- const char *service_name;
- GdmManager *manager;
-} RemoveDisplayData;
-
-static gboolean
-remove_display_for_connection (char *id,
- GdmDisplay *display,
- RemoveDisplayData *data)
-{
- g_assert (display != NULL);
- g_assert (data->service_name != NULL);
-
- /* FIXME: compare service name to that of display */
-#if 0
- if (strcmp (info->service_name, data->service_name) == 0) {
- remove_session_for_cookie (data->manager, cookie, NULL);
- leader_info_cancel (info);
- return TRUE;
- }
-#endif
-
- return FALSE;
-}
-
-static void
-remove_displays_for_connection (GdmManager *manager,
- const char *service_name)
-{
- RemoveDisplayData data;
-
- data.service_name = service_name;
- data.manager = manager;
-
- gdm_display_store_foreach_remove (manager->priv->display_store,
- (GdmDisplayStoreFunc)remove_display_for_connection,
- &data);
-}
-
-static void
-bus_name_owner_changed (DBusGProxy *bus_proxy,
- const char *service_name,
- const char *old_service_name,
- const char *new_service_name,
- GdmManager *manager)
-{
- if (strlen (new_service_name) == 0) {
- remove_displays_for_connection (manager, old_service_name);
- }
-}
-
static gboolean
register_manager (GdmManager *manager)
{
@@ -265,22 +213,6 @@ register_manager (GdmManager *manager)
exit (1);
}
- manager->priv->bus_proxy = dbus_g_proxy_new_for_name (manager->priv->connection,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS);
- dbus_g_proxy_add_signal (manager->priv->bus_proxy,
- "NameOwnerChanged",
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (manager->priv->bus_proxy,
- "NameOwnerChanged",
- G_CALLBACK (bus_name_owner_changed),
- manager,
- NULL);
-
dbus_g_connection_register_g_object (manager->priv->connection, GDM_MANAGER_DBUS_PATH, G_OBJECT (manager));
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]