diff options
author | Bastien Nocera <hadess@hadess.net> | 2013-10-17 00:57:27 +0200 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2013-10-17 00:57:27 +0200 |
commit | b2f72dd69ac683e7fa213d83b410b38fe1ab1b21 (patch) | |
tree | c48e1c3defefd913365d43a71811347603680f16 /src/up-daemon.c | |
parent | c00eda8ca0c2d8dc772b8cc8b4bdc93ab353dc29 (diff) | |
download | upower-b2f72dd69ac683e7fa213d83b410b38fe1ab1b21.tar.gz |
all: Remove WarningLevel from the daemon properties
The WarningLevel property just replicated the warning level
on the display device, or at least should have. So we fix the latter
to remove the former.
Diffstat (limited to 'src/up-daemon.c')
-rw-r--r-- | src/up-daemon.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/up-daemon.c b/src/up-daemon.c index c81e93c..22e9116 100644 --- a/src/up-daemon.c +++ b/src/up-daemon.c @@ -50,7 +50,6 @@ enum PROP_LID_IS_CLOSED, PROP_LID_IS_PRESENT, PROP_IS_DOCKED, - PROP_WARNING_LEVEL, PROP_LAST }; @@ -758,9 +757,8 @@ up_daemon_set_warning_level (UpDaemon *daemon, UpDeviceLevel warning_level) g_debug ("warning_level = %s", up_device_level_to_string (warning_level)); priv->warning_level = warning_level; - g_object_notify (G_OBJECT (daemon), "warning-level"); - up_daemon_queue_changed_property (daemon, "WarningLevel", g_variant_new_uint32 (warning_level)); + g_object_set (G_OBJECT (daemon->priv->display_device), "warning-level", warning_level, NULL); if (daemon->priv->warning_level == UP_DEVICE_LEVEL_ACTION) { if (daemon->priv->action_timeout_id == 0) { @@ -1121,9 +1119,6 @@ up_daemon_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe case PROP_IS_DOCKED: g_value_set_boolean (value, priv->is_docked); break; - case PROP_WARNING_LEVEL: - g_value_set_uint (value, priv->warning_level); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1207,15 +1202,6 @@ up_daemon_class_init (UpDaemonClass *klass) G_PARAM_READABLE)); g_object_class_install_property (object_class, - PROP_WARNING_LEVEL, - g_param_spec_uint ("warning-level", - NULL, NULL, - UP_DEVICE_LEVEL_UNKNOWN, - UP_DEVICE_LEVEL_LAST, - UP_DEVICE_LEVEL_UNKNOWN, - G_PARAM_READABLE)); - - g_object_class_install_property (object_class, PROP_LID_IS_CLOSED, g_param_spec_boolean ("lid-is-closed", "Laptop lid is closed", |