Commit f10a9e7c authored by Christian Kellner's avatar Christian Kellner
Browse files

common: remove unused entries from BolStatus

parent bb574b46
...@@ -787,7 +787,7 @@ bolt_device_disconnected (BoltDevice *dev) ...@@ -787,7 +787,7 @@ bolt_device_disconnected (BoltDevice *dev)
gboolean gboolean
bolt_device_is_connected (BoltDevice *device) bolt_device_is_connected (BoltDevice *device)
{ {
return device->status > BOLT_STATUS_CONNECTING; return bolt_status_is_connected (device->status);
} }
BoltStatus BoltStatus
......
...@@ -118,7 +118,7 @@ print_device (BoltDevice *dev, gboolean verbose) ...@@ -118,7 +118,7 @@ print_device (BoltDevice *dev, gboolean verbose)
g_print (" %s dbus path: %s\n", tree_branch, path); g_print (" %s dbus path: %s\n", tree_branch, path);
g_print (" %s status: %s\n", tree_branch, status_text); g_print (" %s status: %s\n", tree_branch, status_text);
if (status > BOLT_STATUS_CONNECTING) if (bolt_status_is_connected (status))
{ {
if (verbose) if (verbose)
{ {
......
...@@ -26,30 +26,24 @@ ...@@ -26,30 +26,24 @@
/** /**
* BoltStatus * BoltStatus
* @BOLT_STATUS_DISCONNECTED: Device is not connected. * @BOLT_STATUS_DISCONNECTED: Device is not connected.
* @BOLT_STATUS_CONNECTING: Device is currently connecting.
* @BOLT_STATUS_CONNECTED: Device is connected, but not authorized. * @BOLT_STATUS_CONNECTED: Device is connected, but not authorized.
* @BOLT_STATUS_AUTHORIZING: Device is currently authorizing. * @BOLT_STATUS_AUTHORIZING: Device is currently authorizing.
* @BOLT_STATUS_AUTH_ERROR: Failed to authorize a device via a key. * @BOLT_STATUS_AUTH_ERROR: Failed to authorize a device via a key.
* @BOLT_STATUS_AUTHORIZED: Device connected and authorized. * @BOLT_STATUS_AUTHORIZED: Device connected and authorized.
* @BOLT_STATUS_AUTHORIZED_SECURE: Device connected and securely authorized via a key. * @BOLT_STATUS_AUTHORIZED_SECURE: Device connected and securely authorized via a key.
* @BOLT_STATUS_AUTHORIZED_NEWKEY: Device connected and authorized via a new key. * @BOLT_STATUS_AUTHORIZED_NEWKEY: Device connected and authorized via a new key.
* @BOLT_STATUS_GHOST: A parent device is authorizing and therefore the status
* of the device is not know, but most likely it will reappear after the parent
* device is done authenticating.
* *
* The current status of the device. * The current status of the device.
*/ */
typedef enum { typedef enum {
BOLT_STATUS_DISCONNECTED = 0, BOLT_STATUS_DISCONNECTED = 0,
BOLT_STATUS_CONNECTING,
BOLT_STATUS_CONNECTED, BOLT_STATUS_CONNECTED,
BOLT_STATUS_AUTHORIZING, BOLT_STATUS_AUTHORIZING,
BOLT_STATUS_AUTH_ERROR, BOLT_STATUS_AUTH_ERROR,
BOLT_STATUS_AUTHORIZED, BOLT_STATUS_AUTHORIZED,
BOLT_STATUS_AUTHORIZED_SECURE, BOLT_STATUS_AUTHORIZED_SECURE,
BOLT_STATUS_AUTHORIZED_NEWKEY, BOLT_STATUS_AUTHORIZED_NEWKEY,
BOLT_STATUS_GHOST,
BOLT_STATUS_LAST, BOLT_STATUS_LAST,
BOLT_STATUS_INVALID = BOLT_STATUS_LAST BOLT_STATUS_INVALID = BOLT_STATUS_LAST
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment