[gnome-color-manager] Format the udev strings a little nicer
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Format the udev strings a little nicer
- Date: Sat, 28 Nov 2009 23:05:26 +0000 (UTC)
commit ad367269c9806c95a5956513b1d449e09c15e2c7
Author: Richard Hughes <richard hughsie com>
Date: Sat Nov 28 23:02:14 2009 +0000
Format the udev strings a little nicer
src/gcm-client.c | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
---
diff --git a/src/gcm-client.c b/src/gcm-client.c
index fc9fa36..4504005 100644
--- a/src/gcm-client.c
+++ b/src/gcm-client.c
@@ -192,9 +192,9 @@ gcm_client_gudev_add_type (GcmClient *client, GUdevDevice *udev_device, GcmDevic
GError *error = NULL;
const gchar *sysfs_path;
GcmClientPrivate *priv = client->priv;
- const gchar *serial;
- const gchar *manufacturer;
- const gchar *model;
+ gchar *serial = NULL;
+ gchar *manufacturer = NULL;
+ gchar *model = NULL;
/* add new device */
id = gcm_client_get_id_for_udev_device (udev_device);
@@ -217,9 +217,24 @@ gcm_client_gudev_add_type (GcmClient *client, GUdevDevice *udev_device, GcmDevic
/* create device */
device = gcm_device_new ();
- manufacturer = g_udev_device_get_property (udev_device, "ID_VENDOR");
- model = g_udev_device_get_property (udev_device, "ID_MODEL");
- serial = g_udev_device_get_property (udev_device, "ID_SERIAL");
+ manufacturer = g_strdup (g_udev_device_get_property (udev_device, "ID_VENDOR"));
+ model = g_strdup (g_udev_device_get_property (udev_device, "ID_MODEL"));
+ serial = g_strdup (g_udev_device_get_property (udev_device, "ID_SERIAL"));
+
+ /* get rid of underscores */
+ if (manufacturer != NULL) {
+ g_strdelimit (manufacturer, "_", ' ');
+ g_strchomp (manufacturer);
+ }
+ if (model != NULL) {
+ g_strdelimit (model, "_", ' ');
+ g_strchomp (model);
+ }
+ if (serial != NULL) {
+ g_strdelimit (serial, "_", ' ');
+ g_strchomp (serial);
+ }
+
g_object_set (device,
"type", type,
"id", id,
@@ -248,6 +263,9 @@ gcm_client_gudev_add_type (GcmClient *client, GUdevDevice *udev_device, GcmDevic
out:
if (device != NULL)
g_object_unref (device);
+ g_free (serial);
+ g_free (manufacturer);
+ g_free (model);
g_free (id);
g_free (title);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]