[gnome-color-manager/colord] Remove the last parts of GUDev from GcmClient
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager/colord] Remove the last parts of GUDev from GcmClient
- Date: Mon, 17 Jan 2011 16:28:02 +0000 (UTC)
commit d7ca0238bd59f5a0408d5a9fae27745fcb30b1b8
Author: Richard Hughes <richard hughsie com>
Date: Sun Jan 16 15:15:26 2011 +0000
Remove the last parts of GUDev from GcmClient
src/gcm-client.c | 59 ------------------------------------------------------
src/gcm-client.h | 2 -
2 files changed, 0 insertions(+), 61 deletions(-)
---
diff --git a/src/gcm-client.c b/src/gcm-client.c
index 4925973..5310d50 100644
--- a/src/gcm-client.c
+++ b/src/gcm-client.c
@@ -480,50 +480,6 @@ gcm_client_uevent_cb (GUdevClient *gudev_client, const gchar *action, GUdevDevic
}
/**
- * gcm_client_coldplug_devices_udev:
- **/
-static gboolean
-gcm_client_coldplug_devices_udev (GcmClient *client, GError **error)
-{
- GList *devices;
- GList *l;
- GUdevDevice *udev_device;
- GcmClientPrivate *priv = client->priv;
-
- /* get all USB devices */
- devices = g_udev_client_query_by_subsystem (priv->gudev_client, "usb");
- for (l = devices; l != NULL; l = l->next) {
- udev_device = l->data;
- gcm_client_gudev_add (client, udev_device);
- }
-
- /* get all video4linux devices */
- devices = g_udev_client_query_by_subsystem (priv->gudev_client, "video4linux");
- for (l = devices; l != NULL; l = l->next) {
- udev_device = l->data;
- gcm_client_gudev_add (client, udev_device);
- }
-
- g_list_foreach (devices, (GFunc) g_object_unref, NULL);
- g_list_free (devices);
-
- /* inform the UI */
- gcm_client_done_loading (client);
-
- return TRUE;
-}
-
-/**
- * gcm_client_coldplug_devices_udev_thrd:
- **/
-static gpointer
-gcm_client_coldplug_devices_udev_thrd (GcmClient *client)
-{
- gcm_client_coldplug_devices_udev (client, NULL);
- return NULL;
-}
-
-/**
* gcm_client_get_device_by_window_covered:
**/
static gfloat
@@ -1044,21 +1000,6 @@ gcm_client_coldplug (GcmClient *client, GcmClientColdplug coldplug, GError **err
goto out;
}
- /* UDEV */
- if (!coldplug || coldplug & GCM_CLIENT_COLDPLUG_UDEV) {
- gcm_client_add_loading (client);
- g_debug ("adding devices of type UDEV");
- if (client->priv->use_threads) {
- thread = g_thread_create ((GThreadFunc) gcm_client_coldplug_devices_udev_thrd, client, FALSE, error);
- if (thread == NULL)
- goto out;
- } else {
- ret = gcm_client_coldplug_devices_udev (client, error);
- if (!ret)
- goto out;
- }
- }
-
#ifdef HAVE_SANE
/* SANE */
enable = g_settings_get_boolean (client->priv->settings, GCM_SETTINGS_ENABLE_SANE);
diff --git a/src/gcm-client.h b/src/gcm-client.h
index 079e57a..64bd068 100644
--- a/src/gcm-client.h
+++ b/src/gcm-client.h
@@ -63,9 +63,7 @@ struct _GcmClientClass
typedef enum {
GCM_CLIENT_COLDPLUG_ALL = 0x00,
GCM_CLIENT_COLDPLUG_XRANDR = 0x01,
- GCM_CLIENT_COLDPLUG_CUPS = 0x02,
GCM_CLIENT_COLDPLUG_SANE = 0x04,
- GCM_CLIENT_COLDPLUG_UDEV = 0x08,
GCM_CLIENT_COLDPLUG_SAVED = 0x10,
GCM_CLIENT_COLDPLUG_LAST,
} GcmClientColdplug;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]