fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-04-21 01:50:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Provide UpDaemon with C setters rather than relying on GObject properties

Browse source
This commit is contained in:
Richard Hughes 2010-04-19 17:05:59 +01:00
parent 5f1e64709b
commit 3dee7b22f8
5 changed files with 67 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/freebsd/up-backend.c
View file

@ -156,9 +156,8 @@ up_backend_acpi_devd_notify (UpBackend *backend, const gchar *system, const gcha
/* FALLTHROUGH */
}
is_closed = (data != NULL && !strcmp (data, "notify=0x00")) ?
TRUE : FALSE;
g_object_set (backend->priv->daemon, "lid-is-closed", is_closed, NULL);
is_closed = (data != NULL && !strcmp (data, "notify=0x00")) ? TRUE : FALSE;
up_daemon_set_lid_is_closed (backend->priv->daemon, is_closed);
goto out;
}
@ -231,7 +230,7 @@ up_backend_lid_coldplug (UpBackend *backend)
lid_state = up_get_string_sysctl (NULL, "hw.acpi.lid_switch_state");
if (lid_state && strcmp (lid_state, "NONE")) {
g_object_set (backend->priv->daemon, "lid-is-present", TRUE, NULL);
up_daemon_set_lid_is_present (backend->priv->daemon, TRUE);
}
g_free (lid_state);
}

4
src/linux/up-backend.c
View file

@ -138,9 +138,7 @@ up_backend_device_new (UpBackend *backend, GUdevDevice *native)
}
/* we now have a lid */
g_object_set (backend->priv->daemon,
"lid-is-present", TRUE,
NULL);
up_daemon_set_lid_is_present (backend->priv->daemon, TRUE);
/* not a power device */
up_device_list_insert (backend->priv->managed_devices, G_OBJECT (native), G_OBJECT (input));

8
src/linux/up-input.c
View file

@ -152,9 +152,7 @@ up_input_event_io (GIOChannel *channel, GIOCondition condition, gpointer data)
/* are we set */
ret = test_bit (input->priv->event.code, bitmask);
g_object_set (input->priv->daemon,
"lid-is-closed", ret,
NULL);
up_daemon_set_lid_is_closed (input->priv->daemon, ret);
}
out:
return TRUE;
@ -258,9 +256,7 @@ up_input_coldplug (UpInput *input, UpDaemon *daemon, GUdevDevice *d)
/* set if we are closed */
egg_debug ("using %s for lid event", native_path);
g_object_set (input->priv->daemon,
"lid-is-closed", test_bit (SW_LID, bitmask),
NULL);
up_daemon_set_lid_is_closed (input->priv->daemon, test_bit (SW_LID, bitmask));
out:
g_free (path);
g_free (contents);

83
src/up-daemon.c
View file

@ -653,10 +653,8 @@ up_daemon_startup (UpDaemon *daemon)
on_battery = (up_daemon_get_on_battery_local (daemon) &&
!up_daemon_get_on_ac_local (daemon));
on_low_battery = up_daemon_get_on_low_battery_local (daemon);
g_object_set (daemon,
"on-battery", on_battery,
"on-low-battery", on_low_battery,
NULL);
up_daemon_set_on_battery (daemon, on_battery);
up_daemon_set_on_low_battery (daemon, on_low_battery);
/* start signals and callbacks */
g_object_thaw_notify (G_OBJECT(daemon));
@ -678,6 +676,50 @@ up_daemon_get_device_list (UpDaemon *daemon)
return g_object_ref (daemon->priv->power_devices);
}
/**
* up_daemon_set_lid_is_closed:
**/
void
up_daemon_set_lid_is_closed (UpDaemon *daemon, gboolean lid_is_closed)
{
UpDaemonPrivate *priv = daemon->priv;
egg_debug ("lid_is_closed = %s", priv->lid_is_closed ? "yes" : "no");
priv->lid_is_closed = lid_is_closed;
}
/**
* up_daemon_set_lid_is_present:
**/
void
up_daemon_set_lid_is_present (UpDaemon *daemon, gboolean lid_is_present)
{
UpDaemonPrivate *priv = daemon->priv;
egg_debug ("lid_is_present = %s", priv->lid_is_present ? "yes" : "no");
priv->lid_is_present = lid_is_present;
}
/**
* up_daemon_set_on_battery:
**/
void
up_daemon_set_on_battery (UpDaemon *daemon, gboolean on_battery)
{
UpDaemonPrivate *priv = daemon->priv;
egg_debug ("on_battery = %s", priv->on_battery ? "yes" : "no");
priv->on_battery = on_battery;
}
/**
* up_daemon_set_on_low_battery:
**/
void
up_daemon_set_on_low_battery (UpDaemon *daemon, gboolean on_low_battery)
{
UpDaemonPrivate *priv = daemon->priv;
egg_debug ("on_low_battery = %s", priv->on_low_battery ? "yes" : "no");
priv->on_low_battery = on_low_battery;
}
/**
* up_daemon_refresh_battery_devices_cb:
**/
@ -744,15 +786,14 @@ up_daemon_device_changed_cb (UpDevice *device, UpDaemon *daemon)
/* second, check if the on_battery and on_low_battery state has changed */
ret = (up_daemon_get_on_battery_local (daemon) && !up_daemon_get_on_ac_local (daemon));
if (ret != priv->on_battery) {
g_object_set (daemon, "on-battery", ret, NULL);
up_daemon_set_on_battery (daemon, ret);
/* set pm-utils power policy */
up_daemon_set_pmutils_powersave (daemon, ret);
}
ret = up_daemon_get_on_low_battery_local (daemon);
if (ret != priv->on_low_battery) {
g_object_set (daemon, "on-low-battery", ret, NULL);
}
if (ret != priv->on_low_battery)
up_daemon_set_on_low_battery (daemon, ret);
/* emit */
if (!priv->during_coldplug) {
@ -1027,25 +1068,7 @@ up_daemon_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe
static void
up_daemon_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
UpDaemon *daemon = UP_DAEMON (object);
UpDaemonPrivate *priv = daemon->priv;
switch (prop_id) {
case PROP_LID_IS_CLOSED:
priv->lid_is_closed = g_value_get_boolean (value);
egg_debug ("now lid_is_closed = %s", priv->lid_is_closed ? "yes" : "no");
break;
case PROP_LID_IS_PRESENT:
priv->lid_is_present = g_value_get_boolean (value);
egg_debug ("now lid_is_present = %s", priv->lid_is_present ? "yes" : "no");
break;
case PROP_ON_BATTERY:
priv->on_battery = g_value_get_boolean (value);
egg_debug ("now on_battery = %s", priv->on_battery ? "yes" : "no");
break;
case PROP_ON_LOW_BATTERY:
priv->on_low_battery = g_value_get_boolean (value);
egg_debug ("now on_low_battery = %s", priv->on_low_battery ? "yes" : "no");
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -1127,7 +1150,7 @@ up_daemon_class_init (UpDaemonClass *klass)
"Is a laptop",
"If this computer is probably a laptop",
FALSE,
G_PARAM_READWRITE));
G_PARAM_READABLE));
g_object_class_install_property (object_class,
PROP_CAN_SUSPEND,
@ -1151,7 +1174,7 @@ up_daemon_class_init (UpDaemonClass *klass)
"On Battery",
"Whether the system is running on battery",
FALSE,
G_PARAM_READWRITE));
G_PARAM_READABLE));
g_object_class_install_property (object_class,
PROP_ON_LOW_BATTERY,
@ -1159,7 +1182,7 @@ up_daemon_class_init (UpDaemonClass *klass)
"On Low Battery",
"Whether the system is running on battery and if the battery is critically low",
FALSE,
G_PARAM_READWRITE));
G_PARAM_READABLE));
g_object_class_install_property (object_class,
PROP_LID_IS_CLOSED,
@ -1167,7 +1190,7 @@ up_daemon_class_init (UpDaemonClass *klass)
"Laptop lid is closed",
"If the laptop lid is closed",
FALSE,
G_PARAM_READWRITE));
G_PARAM_READABLE));
dbus_g_object_type_install_info (UP_TYPE_DAEMON, &dbus_glib_up_daemon_object_info);

8
src/up-daemon.h
View file

@ -73,6 +73,14 @@ guint up_daemon_get_number_devices_of_type (UpDaemon *daemon,
UpDeviceKind type);
UpDeviceList *up_daemon_get_device_list (UpDaemon *daemon);
gboolean up_daemon_startup (UpDaemon *daemon);
void up_daemon_set_lid_is_closed (UpDaemon *daemon,
gboolean lid_is_closed);
void up_daemon_set_lid_is_present (UpDaemon *daemon,
gboolean lid_is_present);
void up_daemon_set_on_battery (UpDaemon *daemon,
gboolean on_battery);
void up_daemon_set_on_low_battery (UpDaemon *daemon,
gboolean on_low_battery);
/* exported */
gboolean up_daemon_enumerate_devices (UpDaemon *daemon,