[gdm] remove remaining traces of Hal
- From: Martin Pitt <martinpitt src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gdm] remove remaining traces of Hal
- Date: Tue, 26 Jan 2010 19:13:42 +0000 (UTC)
commit bbad0645c8dc70a57db415e02f838769a21a6539
Author: Martin Pitt <martin pitt ubuntu com>
Date: Thu Jan 21 00:00:02 2010 +0100
remove remaining traces of Hal
The code which used the Hal connection already was disabled, so gdm connected
to Hal in vain (which just triggered Hal startup when using D-Bus activation).
Remove all remaining traces of hal now.
https://bugzilla.gnome.org/show_bug.cgi?id=593787
.gitignore | 1 -
daemon/Makefile.am | 9 --
daemon/gdm-local-display-factory.c | 110 -----------------------
daemon/test-hal-seats.c | 173 ------------------------------------
4 files changed, 0 insertions(+), 293 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7cca11e..aa34fd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,7 +106,6 @@ daemon/gdm-product-slave
daemon/gdm-session-worker
daemon/gdm-simple-slave
daemon/gdm-xdmcp-chooser-slave
-daemon/test-hal-seats
daemon/test-session
data/gdm.schemas.in
depcomp
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 5e04d41..ee69010 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -76,18 +76,9 @@ gdm-product-display-glue.h: gdm-product-display.xml Makefile.am
dbus-binding-tool --prefix=gdm_product_display --mode=glib-server --output=gdm-product-display-glue.h $(srcdir)/gdm-product-display.xml
noinst_PROGRAMS = \
- test-hal-seats \
test-session \
$(NULL)
-test_hal_seats_SOURCES = \
- test-hal-seats.c \
- $(NULL)
-
-test_hal_seats_LDADD = \
- $(DAEMON_LIBS) \
- $(NULL)
-
test_session_SOURCES = \
test-session.c \
gdm-session.c \
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 3984ada..69daf9e 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -45,12 +45,6 @@
#define GDM_LOCAL_DISPLAY_FACTORY_DBUS_PATH GDM_DBUS_PATH "/LocalDisplayFactory"
#define GDM_MANAGER_DBUS_NAME "org.gnome.DisplayManager.LocalDisplayFactory"
-#define HAL_DBUS_NAME "org.freedesktop.Hal"
-#define HAL_DBUS_MANAGER_PATH "/org/freedesktop/Hal/Manager"
-#define HAL_DBUS_MANAGER_INTERFACE "org.freedesktop.Hal.Manager"
-#define HAL_DBUS_DEVICE_INTERFACE "org.freedesktop.Hal.Device"
-#define SEAT_PCI_DEVICE_CLASS 3
-
#define MAX_DISPLAY_FAILURES 5
struct GdmLocalDisplayFactoryPrivate
@@ -372,83 +366,6 @@ create_display (GdmLocalDisplayFactory *factory)
return display;
}
-#if 0
-static void
-create_display_for_device (GdmLocalDisplayFactory *factory,
- DBusGProxy *device_proxy)
-{
- create_display (factory);
-}
-
-static void
-create_displays_for_pci_devices (GdmLocalDisplayFactory *factory)
-{
- char **devices;
- const char *key;
- const char *value;
- GError *error;
- gboolean res;
- int i;
-
- g_debug ("GdmLocalDisplayFactory: Getting PCI seat devices");
-
- key = "info.bus";
- value = "pci";
-
- devices = NULL;
- error = NULL;
- res = dbus_g_proxy_call (factory->priv->proxy,
- "FindDeviceStringMatch",
- &error,
- G_TYPE_STRING, key,
- G_TYPE_STRING, value,
- G_TYPE_INVALID,
- G_TYPE_STRV, &devices,
- G_TYPE_INVALID);
- if (! res) {
- g_warning ("Unable to query HAL: %s", error->message);
- g_error_free (error);
- }
-
- /* now look for pci class 3 */
- key = "pci.device_class";
- for (i = 0; devices [i] != NULL; i++) {
- DBusGProxy *device_proxy;
- int class_val;
-
- device_proxy = dbus_g_proxy_new_for_name (factory->priv->connection,
- HAL_DBUS_NAME,
- devices [i],
- HAL_DBUS_DEVICE_INTERFACE);
- if (device_proxy == NULL) {
- continue;
- }
-
- error = NULL;
- res = dbus_g_proxy_call (device_proxy,
- "GetPropertyInteger",
- &error,
- G_TYPE_STRING, key,
- G_TYPE_INVALID,
- G_TYPE_INT, &class_val,
- G_TYPE_INVALID);
- if (! res) {
- g_warning ("Unable to query HAL: %s", error->message);
- g_error_free (error);
- }
-
- if (class_val == SEAT_PCI_DEVICE_CLASS) {
- g_debug ("GdmLocalDisplayFactory: Found device: %s", devices [i]);
- create_display_for_device (factory, device_proxy);
- }
-
- g_object_unref (device_proxy);
- }
-
- g_strfreev (devices);
-}
-#endif
-
static gboolean
gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
{
@@ -525,29 +442,6 @@ register_factory (GdmLocalDisplayFactory *factory)
return TRUE;
}
-static gboolean
-connect_to_hal (GdmLocalDisplayFactory *factory)
-{
- 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;
- }
-
- return TRUE;
-}
-
-static void
-disconnect_from_hal (GdmLocalDisplayFactory *factory)
-{
- if (factory->priv->proxy == NULL) {
- g_object_unref (factory->priv->proxy);
- }
-}
-
static GObject *
gdm_local_display_factory_constructor (GType type,
guint n_construct_properties,
@@ -565,8 +459,6 @@ gdm_local_display_factory_constructor (GType type,
g_warning ("Unable to register local display factory with system bus");
}
- connect_to_hal (factory);
-
return G_OBJECT (factory);
}
@@ -611,8 +503,6 @@ gdm_local_display_factory_finalize (GObject *object)
g_hash_table_destroy (factory->priv->displays);
- disconnect_from_hal (factory);
-
G_OBJECT_CLASS (gdm_local_display_factory_parent_class)->finalize (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]