summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2008-11-12 09:58:36 +0000
committerRichard Hughes <richard@hughsie.com>2008-11-12 09:58:36 +0000
commit35bd038ac79957d22cea6c9b5b50f1f003c427d7 (patch)
tree9a3c383c53fa1134ce7e067a89175b2b2d8c92e2
parent0f560f820e7ee27b9849d9178686a9b8557bbeaa (diff)
trivial cleanups of davidz patch -- no functional changes
-rw-r--r--libdevkit-power/dkp-client.c141
-rw-r--r--src/dkp-csr.c10
-rw-r--r--src/dkp-daemon.c100
-rw-r--r--tools/dkp-tool.c16
4 files changed, 139 insertions, 128 deletions
diff --git a/libdevkit-power/dkp-client.c b/libdevkit-power/dkp-client.c
index dc68954..bfb17eb 100644
--- a/libdevkit-power/dkp-client.c
+++ b/libdevkit-power/dkp-client.c
@@ -101,113 +101,130 @@ dkp_client_enumerate_devices (DkpClient *client, GError **error)
return devices;
}
+/**
+ * dkp_client_ensure_properties:
+ **/
static void
-ensure_properties (DkpClient *client)
+dkp_client_ensure_properties (DkpClient *client)
{
- GError *error;
- GHashTable *props;
- GValue *value;
+ gboolean ret;
+ GError *error;
+ GHashTable *props;
+ GValue *value;
- props = NULL;
+ props = NULL;
if (client->priv->have_properties)
goto out;
- error = NULL;
- if (!dbus_g_proxy_call (client->priv->prop_proxy,
- "GetAll",
- &error,
- G_TYPE_STRING,
- "org.freedesktop.DeviceKit.Power",
- G_TYPE_INVALID,
- dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE),
- &props,
- G_TYPE_INVALID)) {
- g_warning ("Error invokving GetAll() to get properties: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
-
- value = g_hash_table_lookup (props, "daemon-version");
- if (value == NULL) {
- g_warning ("No 'daemon-version' property");
- goto out;
- }
- client->priv->daemon_version = g_strdup (g_value_get_string (value));
-
- value = g_hash_table_lookup (props, "can-suspend");
- if (value == NULL) {
- g_warning ("No 'can-suspend' property");
- goto out;
- }
- client->priv->can_suspend = g_value_get_boolean (value);
-
- value = g_hash_table_lookup (props, "can-hibernate");
- if (value == NULL) {
- g_warning ("No 'can-hibernate' property");
- goto out;
- }
- client->priv->can_hibernate = g_value_get_boolean (value);
-
- value = g_hash_table_lookup (props, "on-battery");
- if (value == NULL) {
- g_warning ("No 'on-battery' property");
- goto out;
- }
- client->priv->on_battery = g_value_get_boolean (value);
-
- value = g_hash_table_lookup (props, "on-low-battery");
- if (value == NULL) {
- g_warning ("No 'on-low-battery' property");
- goto out;
- }
- client->priv->on_low_battery = g_value_get_boolean (value);
+ error = NULL;
+ ret = dbus_g_proxy_call (client->priv->prop_proxy, "GetAll", &error,
+ G_TYPE_STRING, "org.freedesktop.DeviceKit.Power",
+ G_TYPE_INVALID,
+ dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props,
+ G_TYPE_INVALID);
+ if (!ret) {
+ g_warning ("Error invoking GetAll() to get properties: %s", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ value = g_hash_table_lookup (props, "daemon-version");
+ if (value == NULL) {
+ g_warning ("No 'daemon-version' property");
+ goto out;
+ }
+ client->priv->daemon_version = g_strdup (g_value_get_string (value));
+
+ value = g_hash_table_lookup (props, "can-suspend");
+ if (value == NULL) {
+ g_warning ("No 'can-suspend' property");
+ goto out;
+ }
+ client->priv->can_suspend = g_value_get_boolean (value);
+
+ value = g_hash_table_lookup (props, "can-hibernate");
+ if (value == NULL) {
+ g_warning ("No 'can-hibernate' property");
+ goto out;
+ }
+ client->priv->can_hibernate = g_value_get_boolean (value);
+
+ value = g_hash_table_lookup (props, "on-battery");
+ if (value == NULL) {
+ g_warning ("No 'on-battery' property");
+ goto out;
+ }
+ client->priv->on_battery = g_value_get_boolean (value);
+
+ value = g_hash_table_lookup (props, "on-low-battery");
+ if (value == NULL) {
+ g_warning ("No 'on-low-battery' property");
+ goto out;
+ }
+ client->priv->on_low_battery = g_value_get_boolean (value);
+
+ /* cached */
client->priv->have_properties = TRUE;
out:
- if (props != NULL)
- g_hash_table_unref (props);
+ if (props != NULL)
+ g_hash_table_unref (props);
}
+/**
+ * dkp_client_get_daemon_version:
+ **/
const gchar *
dkp_client_get_daemon_version (DkpClient *client)
{
g_return_val_if_fail (DKP_IS_CLIENT (client), NULL);
- ensure_properties (client);
+ dkp_client_ensure_properties (client);
return client->priv->daemon_version;
}
+/**
+ * dkp_client_can_hibernate:
+ **/
gboolean
dkp_client_can_hibernate (DkpClient *client)
{
g_return_val_if_fail (DKP_IS_CLIENT (client), FALSE);
- ensure_properties (client);
+ dkp_client_ensure_properties (client);
return client->priv->can_hibernate;
}
+/**
+ * dkp_client_can_suspend:
+ **/
gboolean
dkp_client_can_suspend (DkpClient *client)
{
g_return_val_if_fail (DKP_IS_CLIENT (client), FALSE);
- ensure_properties (client);
+ dkp_client_ensure_properties (client);
return client->priv->can_suspend;
}
+/**
+ * dkp_client_on_battery:
+ **/
gboolean
dkp_client_on_battery (DkpClient *client)
{
g_return_val_if_fail (DKP_IS_CLIENT (client), FALSE);
- ensure_properties (client);
+ dkp_client_ensure_properties (client);
return client->priv->on_battery;
}
+/**
+ * dkp_client_on_low_battery:
+ **/
gboolean
dkp_client_on_low_battery (DkpClient *client)
{
g_return_val_if_fail (DKP_IS_CLIENT (client), FALSE);
- ensure_properties (client);
+ dkp_client_ensure_properties (client);
return client->priv->on_low_battery;
}
diff --git a/src/dkp-csr.c b/src/dkp-csr.c
index b73efff..8815a40 100644
--- a/src/dkp-csr.c
+++ b/src/dkp-csr.c
@@ -90,7 +90,7 @@ dkp_csr_poll_cb (DkpCsr *csr)
/**
* dkp_csr_find_device:
**/
-static struct usb_device *
+static struct usb_device *
dkp_csr_find_device (DkpCsr *csr)
{
struct usb_bus *curr_bus;
@@ -107,14 +107,14 @@ dkp_csr_find_device (DkpCsr *csr)
if (g_strcasecmp (dir_name, curr_bus->dirname))
continue;
- for (curr_device = curr_bus->devices; curr_device != NULL;
+ for (curr_device = curr_bus->devices; curr_device != NULL;
curr_device = curr_device->next) {
/* egg_debug ("Checking port: [%s]", curr_device->filename); */
if (g_strcasecmp (filename, curr_device->filename))
continue;
- egg_debug ("Matched device: [%s][%s][%04X:%04X]", curr_bus->dirname,
- curr_device->filename,
- curr_device->descriptor.idVendor,
+ egg_debug ("Matched device: [%s][%s][%04X:%04X]", curr_bus->dirname,
+ curr_device->filename,
+ curr_device->descriptor.idVendor,
curr_device->descriptor.idProduct);
goto out;
}
diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c
index e72a80b..e4d50a2 100644
--- a/src/dkp-daemon.c
+++ b/src/dkp-daemon.c
@@ -155,34 +155,34 @@ dkp_daemon_get_property (GObject *object,
daemon = DKP_DAEMON (object);
- switch (prop_id) {
+ switch (prop_id) {
- case PROP_DAEMON_VERSION:
- g_value_set_string (value, PACKAGE_VERSION);
- break;
+ case PROP_DAEMON_VERSION:
+ g_value_set_string (value, PACKAGE_VERSION);
+ break;
- case PROP_CAN_SUSPEND:
+ case PROP_CAN_SUSPEND:
/* TODO: for now assume we can always suspend */
- g_value_set_boolean (value, TRUE);
- break;
+ g_value_set_boolean (value, TRUE);
+ break;
- case PROP_CAN_HIBERNATE:
+ case PROP_CAN_HIBERNATE:
/* TODO for now assume we can always hibernate */
- g_value_set_boolean (value, TRUE);
- break;
+ g_value_set_boolean (value, TRUE);
+ break;
- case PROP_ON_BATTERY:
- g_value_set_boolean (value, daemon->priv->on_battery);
- break;
+ case PROP_ON_BATTERY:
+ g_value_set_boolean (value, daemon->priv->on_battery);
+ break;
- case PROP_ON_LOW_BATTERY:
- g_value_set_boolean (value, daemon->priv->on_battery && daemon->priv->low_battery);
- break;
+ case PROP_ON_LOW_BATTERY:
+ g_value_set_boolean (value, daemon->priv->on_battery && daemon->priv->low_battery);
+ break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
/**
@@ -203,8 +203,7 @@ dkp_daemon_class_init (DkpDaemonClass *klass)
g_signal_new ("device-added",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
- 0,
- NULL, NULL,
+ 0, NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
@@ -212,8 +211,7 @@ dkp_daemon_class_init (DkpDaemonClass *klass)
g_signal_new ("device-removed",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
- 0,
- NULL, NULL,
+ 0, NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
@@ -221,8 +219,7 @@ dkp_daemon_class_init (DkpDaemonClass *klass)
g_signal_new ("device-changed",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
- 0,
- NULL, NULL,
+ 0, NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
@@ -230,47 +227,46 @@ dkp_daemon_class_init (DkpDaemonClass *klass)
g_signal_new ("changed",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
- 0,
- NULL, NULL,
+ 0, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 0);
- g_object_class_install_property (object_class,
- PROP_DAEMON_VERSION,
- g_param_spec_string ("daemon-version",
- "Daemon Version",
- "The version of the running daemon",
- NULL,
- G_PARAM_READABLE));
+ g_object_class_install_property (object_class,
+ PROP_DAEMON_VERSION,
+ g_param_spec_string ("daemon-version",
+ "Daemon Version",
+ "The version of the running daemon",
+ NULL,
+ G_PARAM_READABLE));
- g_object_class_install_property (object_class,
- PROP_CAN_SUSPEND,
- g_param_spec_boolean ("can-suspend",
+ g_object_class_install_property (object_class,
+ PROP_CAN_SUSPEND,
+ g_param_spec_boolean ("can-suspend",
"Can Suspend",
"Whether the system can suspend",
FALSE,
G_PARAM_READABLE));
- g_object_class_install_property (object_class,
- PROP_CAN_SUSPEND,
- g_param_spec_boolean ("can-hibernate",
+ g_object_class_install_property (object_class,
+ PROP_CAN_SUSPEND,
+ g_param_spec_boolean ("can-hibernate",
"Can Hibernate",
"Whether the system can hibernate",
FALSE,
G_PARAM_READABLE));
- g_object_class_install_property (object_class,
- PROP_ON_BATTERY,
- g_param_spec_boolean ("on-battery",
+ g_object_class_install_property (object_class,
+ PROP_ON_BATTERY,
+ g_param_spec_boolean ("on-battery",
"On Battery",
"Whether the system is running on battery",
FALSE,
G_PARAM_READABLE));
- g_object_class_install_property (object_class,
- PROP_ON_LOW_BATTERY,
- g_param_spec_boolean ("on-low-battery",
+ g_object_class_install_property (object_class,
+ PROP_ON_LOW_BATTERY,
+ g_param_spec_boolean ("on-low-battery",
"On Low Battery",
"Whether the system is running on battery and if the battery is critically low",
FALSE,
@@ -375,15 +371,13 @@ gpk_daemon_dbus_filter (DBusConnection *connection, DBusMessage *message, void *
interface = dbus_message_get_interface (message);
- if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
- /* pass NameOwnerChanged signals from the bus to PolKitTracker */
+ /* pass NameOwnerChanged signals from the bus to PolKitTracker */
+ if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
polkit_tracker_dbus_func (daemon->priv->pk_tracker, message);
- }
- if (interface != NULL && g_str_has_prefix (interface, "org.freedesktop.ConsoleKit")) {
- /* pass ConsoleKit signals to PolKitTracker */
+ /* pass ConsoleKit signals to PolKitTracker */
+ if (interface != NULL && g_str_has_prefix (interface, "org.freedesktop.ConsoleKit"))
polkit_tracker_dbus_func (daemon->priv->pk_tracker, message);
- }
/* other filters might want to process this message too */
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
diff --git a/tools/dkp-tool.c b/tools/dkp-tool.c
index b774044..3881516 100644
--- a/tools/dkp-tool.c
+++ b/tools/dkp-tool.c
@@ -44,7 +44,7 @@ static gboolean opt_monitor_detail = FALSE;
static void
dkp_tool_device_added_cb (DkpClient *client, const DkpClientDevice *device, gpointer user_data)
{
- g_print ("added: %s\n", dkp_client_device_get_object_path (device));
+ g_print ("device added: %s\n", dkp_client_device_get_object_path (device));
if (opt_monitor_detail) {
dkp_client_device_print (device);
g_print ("\n");
@@ -57,7 +57,7 @@ dkp_tool_device_added_cb (DkpClient *client, const DkpClientDevice *device, gpoi
static void
dkp_tool_device_changed_cb (DkpClient *client, const DkpClientDevice *device, gpointer user_data)
{
- g_print ("changed: %s\n", dkp_client_device_get_object_path (device));
+ g_print ("device changed: %s\n", dkp_client_device_get_object_path (device));
if (opt_monitor_detail) {
/* TODO: would be nice to just show the diff */
dkp_client_device_print (device);
@@ -71,7 +71,7 @@ dkp_tool_device_changed_cb (DkpClient *client, const DkpClientDevice *device, gp
static void
dkp_tool_device_removed_cb (DkpClient *client, const DkpClientDevice *device, gpointer user_data)
{
- g_print ("removed: %s\n", dkp_client_device_get_object_path (device));
+ g_print ("device removed: %s\n", dkp_client_device_get_object_path (device));
if (opt_monitor_detail)
g_print ("\n");
}
@@ -143,7 +143,7 @@ main (int argc, char **argv)
{ "monitor", 'm', 0, G_OPTION_ARG_NONE, &opt_monitor, _("Monitor activity from the power daemon"), NULL },
{ "monitor-detail", 0, 0, G_OPTION_ARG_NONE, &opt_monitor_detail, _("Monitor with detail"), NULL },
{ "show-info", 'i', 0, G_OPTION_ARG_STRING, &opt_show_info, _("Show information about object path"), NULL },
- { "version", 'v', 0, G_OPTION_ARG_NONE, &opt_version, "Print version of client and daemon", NULL },
+ { "version", 'v', 0, G_OPTION_ARG_NONE, &opt_version, "Print version of client and daemon", NULL },
{ NULL }
};
@@ -159,10 +159,10 @@ main (int argc, char **argv)
client = dkp_client_new ();
if (opt_version) {
- g_print ("DeviceKit-power client version %s\n"
- "DeviceKit-power daemon version %s\n",
- PACKAGE_VERSION,
- dkp_client_get_daemon_version (client));
+ g_print ("DeviceKit-power client version %s\n"
+ "DeviceKit-power daemon version %s\n",
+ PACKAGE_VERSION,
+ dkp_client_get_daemon_version (client));
ret = 0;
goto out;
}