brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thunderbolt: adapt to bolt 0.2 interface changes

Browse Source 
All enums are now strings on the bus. Also the Device.Security
property is gnome. Some new properties got added instead.
This commit is contained in:
Christian Kellner
2018-03-05 21:03:20 +01:00
parent 5e9e4f8c73
commit cccfc7faca
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
js/ui/status/thunderbolt.js
View File

@ -19,8 +19,8 @@ const BoltClientInterface = '<node> \
<property name="Probing" type="b" access="read"></property> \ <property name="Probing" type="b" access="read"></property> \
<method name="EnrollDevice"> \ <method name="EnrollDevice"> \
<arg type="s" name="uid" direction="in"> </arg> \ <arg type="s" name="uid" direction="in"> </arg> \
<arg type="u" name="policy" direction="in"> </arg> \ <arg type="s" name="policy" direction="in"> </arg> \
<arg type="u" name="flags" direction="in"> </arg> \ <arg type="s" name="flags" direction="in"> </arg> \
<arg name="device" direction="out" type="o"> </arg> \ <arg name="device" direction="out" type="o"> </arg> \
</method> \ </method> \
<signal name="DeviceAdded"> \ <signal name="DeviceAdded"> \
@ -34,13 +34,17 @@ const BoltDeviceInterface = '<node> \
<property name="Uid" type="s" access="read"></property> \ <property name="Uid" type="s" access="read"></property> \
<property name="Name" type="s" access="read"></property> \ <property name="Name" type="s" access="read"></property> \
<property name="Vendor" type="s" access="read"></property> \ <property name="Vendor" type="s" access="read"></property> \
<property name="Status" type="u" access="read"></property> \ <property name="Type" type="s" access="read"></property> \
<property name="SysfsPath" type="s" access="read"></property> \ <property name="Status" type="s" access="read"></property> \
<property name="Security" type="u" access="read"></property> \
<property name="Parent" type="s" access="read"></property> \ <property name="Parent" type="s" access="read"></property> \
<property name="SysfsPath" type="s" access="read"></property> \
<property name="Stored" type="b" access="read"></property> \ <property name="Stored" type="b" access="read"></property> \
<property name="Policy" type="u" access="read"></property> \ <property name="Policy" type="s" access="read"></property> \
<property name="Key" type="u" access="read"></property> \ <property name="Key" type="s" access="read"></property> \
<property name="Label" type="s" access="read"></property> \
<property name="ConnectTime" type="t" access="read"></property> \
<property name="AuthorizeTime" type="t" access="read"></property> \
<property name="StoreTime" type="t" access="read"></property> \
</interface> \ </interface> \
</node>'; </node>';
@ -50,23 +54,25 @@ const BoltDeviceProxy = Gio.DBusProxy.makeProxyWrapper(BoltDeviceInterface);
/* */ /* */
var Status = { var Status = {
DISCONNECTED: 0, DISCONNECTED: 'disconnected',
CONNECTED: 1, CONNECTED: 'connected',
AUTHORIZING: 2, AUTHORIZING: 'authorizing',
AUTH_ERROR: 3, AUTH_ERROR: 'auth-error',
AUTHORIZED: 4, AUTHORIZED: 'authorized',
AUTHORIZED_SECURE: 5, AUTHORIZED_SECURE: 'authorized-secure',
AUTHORIZED_NEWKY: 6 AUTHORIZED_NEWKEY: 'authorized-newkey'
}; };
var Policy = { var Policy = {
DEFAULT: 0, DEFAULT: 'default',
MANUAL: 1, MANUAL: 'manual',
AUTO:2 AUTO: 'auto'
}; };
var AuthFlags = { var AuthFlags = {
NONE: 0, NONE: 'none',
};
}; };
const BOLT_DBUS_NAME = 'org.freedesktop.bolt'; const BOLT_DBUS_NAME = 'org.freedesktop.bolt';