wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge b-i to m-c

Browse Source
This commit is contained in:
Phil Ringnalda 2013-10-03 20:56:15 -07:00
commit 09aaa238ef
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "ebb5c473c94911bb98acff5d46f6af209c12583e",
"revision": "06ea7706d72174637b5f956122f52200d3f81fda",
"repo_path": "/integration/gaia-central"
}

10
dom/bluetooth/BluetoothHfpManager.cpp
View File

@ -1653,14 +1653,8 @@ BluetoothHfpManager::ConnectSco(BluetoothReplyRunnable* aRunnable)
bool
BluetoothHfpManager::DisconnectSco()
{
if (!IsConnected()) {
BT_WARNING("BluetoothHfpManager is not connected");
return false;
}
SocketConnectionStatus status = mScoSocket->GetConnectionStatus();
if (status != SOCKET_CONNECTED && status != SOCKET_CONNECTING) {
BT_WARNING("No SCO exists");
if (!IsScoConnected()) {
BT_WARNING("SCO has been already disconnected.");
return false;
}

2
dom/wifi/WifiWorker.js
View File

@ -2348,7 +2348,7 @@ function WifiWorker() {
self.networksArray = [];
for (let i = 1; i < lines.length; ++i) {
// bssid / frequency / signal level / flags / ssid
var match = /([\S]+)\s+([\S]+)\s+([\S]+)\s+(\[[\S]+\])?\s+(.*)/.exec(lines[i]);
var match = /([\S]+)\s+([\S]+)\s+([\S]+)\s+(\[[\S]+\])?\s(.*)/.exec(lines[i]);
if (match && match[5]) {
let ssid = match[5],