commit 9e72a1f4cae2a6b60f6afff967a1cb4f2b3f17cf Author: Christophe Fergeau <cferg...@mandriva.com> Date: Sat Feb 6 01:33:25 2010 +0100
make udev podsleuth-like information optional The HAL callout exports various information about the ipod to the HAL device tree to mimic what Podsleuth does. However, this kind of information isn't something that belongs here and is one of the reasons why HAL is being phased out in favour of udev + various specialized daemon. Hence we don't want necessarily want to export it in the udev callout, so make it optional. tools/udev-backend.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) --- diff --git a/tools/udev-backend.c b/tools/udev-backend.c index 8bc49b2..24185ea 100644 --- a/tools/udev-backend.c +++ b/tools/udev-backend.c @@ -47,14 +47,18 @@ static void udev_backend_destroy (ItdbBackend *itdb_backend) static gboolean udev_backend_set_version (ItdbBackend *itdb_backend, unsigned int version) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"VERSION=%u\n", version); +#endif return TRUE; } static gboolean udev_backend_set_is_unknown (ItdbBackend *itdb_backend, gboolean unknown) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"IS_UNKNOWN=%u\n", !!unknown); +#endif return TRUE; } @@ -68,42 +72,54 @@ udev_backend_set_icon_name (ItdbBackend *itdb_backend, const char *icon_name) static gboolean udev_backend_set_firewire_id (ItdbBackend *itdb_backend, const char *fwid) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"FIREWIRE_ID=%s\n", fwid); +#endif return TRUE; } static gboolean udev_backend_set_serial_number (ItdbBackend *itdb_backend, const char *serial_number) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"SERIAL_NUMBER=%s\n", serial_number); +#endif return TRUE; } static gboolean udev_backend_set_firmware_version (ItdbBackend *itdb_backend, const char *firmware_version) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"FIRMWARE_VERSION=%s\n", firmware_version); +#endif return TRUE; } static gboolean udev_backend_set_model_name (ItdbBackend *itdb_backend, const char *model_name) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"DEVICE_CLASS=%s\n", model_name); +#endif return TRUE; } static gboolean udev_backend_set_generation (ItdbBackend *itdb_backend, gdouble generation) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"MODEL_GENERATION=%f\n", generation); +#endif return TRUE; } static gboolean udev_backend_set_color (ItdbBackend *itdb_backend, const char *color_name) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"MODEL_SHELL_COLOR=%s\n", color_name); +#endif return TRUE; } @@ -111,35 +127,45 @@ static gboolean udev_backend_set_factory_id (ItdbBackend *itdb_backend, const char *factory_id) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"PRODUCTION_FACTORY_ID=%s\n", factory_id); +#endif return TRUE; } static gboolean udev_backend_set_production_year (ItdbBackend *itdb_backend, guint year) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"PRODUCTION_YEAR=%u\n", year); +#endif return TRUE; } static gboolean udev_backend_set_production_week (ItdbBackend *itdb_backend, guint week) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"PRODUCTION_WEEK=%u\n", week); +#endif return TRUE; } static gboolean udev_backend_set_production_index (ItdbBackend *itdb_backend, guint index) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"PRODUCTION_INDEX=%u\n", index); +#endif return TRUE; } static gboolean udev_backend_set_control_path (ItdbBackend *itdb_backend, const char *control_path) { +#ifdef UPODSLEUTH g_print (LIBGPOD_UDEV_NS"MODEL_CONTROL_PATH=%s\n", control_path); +#endif return TRUE; } @@ -150,6 +176,7 @@ udev_backend_set_name (ItdbBackend *itdb_backend, const char *name) return TRUE; } +#ifdef UPODSLEUTH static gboolean udev_backend_set_artwork_type_supported (ItdbBackend *itdb_backend, enum ArtworkType type, gboolean supported) @@ -171,13 +198,16 @@ static gboolean udev_backend_set_artwork_type_supported (ItdbBackend *itdb_backe g_print (propname, !!supported); return TRUE; } +#endif static gboolean udev_backend_set_artwork_formats (ItdbBackend *itdb_backend, enum ArtworkType type, const GList *formats) { +#ifdef UPODSLEUTH udev_backend_set_artwork_type_supported (itdb_backend, type, (formats != NULL)); +#endif return TRUE; } ------------------------------------------------------------------------------ SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW http://p.sf.net/sfu/solaris-dev2dev _______________________________________________ gtkpod-cvs2 mailing list gtkpod-cvs2@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2