diff options
| author | Richard Hughes <richard@hughsie.com> | 2010-01-26 10:53:04 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2010-01-26 10:53:04 +0000 |
| commit | 5e8ba5457305da1fef2a891a3766e9612506c58b (patch) | |
| tree | 6429bfee48cd210b34941eea5b4c3dc04c28f248 /src/up-device.c | |
| parent | 27fada20be7feba6783abc5b6cad91ee274ad3df (diff) | |
| download | upower-5e8ba5457305da1fef2a891a3766e9612506c58b.tar.gz | |
trivial: rename the new libupower 'type' to 'kind' to avoid clashing with GObject generated names
Diffstat (limited to 'src/up-device.c')
| -rw-r--r-- | src/up-device.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/up-device.c b/src/up-device.c index 7dad441..5ace215 100644 --- a/src/up-device.c +++ b/src/up-device.c @@ -65,7 +65,7 @@ struct UpDevicePrivate gboolean is_rechargeable; gboolean has_history; gboolean has_statistics; - UpDeviceType type; + UpDeviceKind type; UpDeviceState state; UpDeviceTechnology technology; gdouble capacity; /* percent */ @@ -433,11 +433,11 @@ up_device_get_id (UpDevice *device) gchar *id = NULL; /* line power */ - if (device->priv->type == UP_DEVICE_TYPE_LINE_POWER) { + if (device->priv->type == UP_DEVICE_KIND_LINE_POWER) { goto out; /* batteries */ - } else if (device->priv->type == UP_DEVICE_TYPE_BATTERY) { + } else if (device->priv->type == UP_DEVICE_KIND_BATTERY) { /* we don't have an ID if we are not present */ if (!device->priv->is_present) goto out; @@ -795,7 +795,7 @@ up_device_compute_object_path (UpDevice *device) const gchar *type; guint i; - type = up_device_type_to_text (device->priv->type); + type = up_device_kind_to_text (device->priv->type); native_path = device->priv->native_path; basename = g_path_get_basename (native_path); id = g_strjoin ("_", type, basename, NULL); @@ -1047,9 +1047,9 @@ up_device_class_init (UpDeviceClass *klass) PROP_TYPE, g_param_spec_uint ("type", NULL, NULL, - UP_DEVICE_TYPE_UNKNOWN, - UP_DEVICE_TYPE_LAST, - UP_DEVICE_TYPE_UNKNOWN, + UP_DEVICE_KIND_UNKNOWN, + UP_DEVICE_KIND_LAST, + UP_DEVICE_KIND_UNKNOWN, G_PARAM_READWRITE)); /** * UpDevice:state: |