mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-11 18:29:05 +01:00
64 lines
2.9 KiB
Diff
64 lines
2.9 KiB
Diff
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove/pom.xml bluecove-2.1.1-SNAPSHOT-briar/bluecove/pom.xml
|
|
--- bluecove-2.1.1-SNAPSHOT/bluecove/pom.xml 2013-01-04 00:43:17.961294408 +0000
|
|
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove/pom.xml 2013-01-03 23:17:37.549293571 +0000
|
|
@@ -126,8 +126,8 @@
|
|
<plugin>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<configuration>
|
|
- <source>1.3</source>
|
|
- <target>1.1</target>
|
|
+ <source>1.5</source>
|
|
+ <target>1.5</target>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
@@ -355,7 +355,7 @@
|
|
<configuration>
|
|
<linkXref>true</linkXref>
|
|
<minimumTokens>100</minimumTokens>
|
|
- <targetJdk>1.4</targetJdk>
|
|
+ <targetJdk>1.5</targetJdk>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm bluecove-2.1.1-SNAPSHOT-briar/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm
|
|
--- bluecove-2.1.1-SNAPSHOT/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm 2013-01-04 00:43:17.549293781 +0000
|
|
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm 2013-01-03 23:19:02.269295705 +0000
|
|
@@ -280,6 +280,10 @@
|
|
ndebug(("fail to get IOBluetoothRFCOMMChannel"));
|
|
return;
|
|
}
|
|
+ if(![rfcommChannel isIncoming]) {
|
|
+ ndebug(("ignoring outgoing connection"));
|
|
+ return;
|
|
+ }
|
|
if (comm->authenticate) {
|
|
IOBluetoothDevice* device = [rfcommChannel getDevice];
|
|
if (device == NULL) {
|
|
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove-gpl/pom.xml bluecove-2.1.1-SNAPSHOT-briar/bluecove-gpl/pom.xml
|
|
--- bluecove-2.1.1-SNAPSHOT/bluecove-gpl/pom.xml 2013-01-04 00:43:14.509294005 +0000
|
|
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove-gpl/pom.xml 2013-01-03 23:17:52.181293751 +0000
|
|
@@ -81,8 +81,8 @@
|
|
<plugin>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<configuration>
|
|
- <source>1.3</source>
|
|
- <target>1.1</target>
|
|
+ <source>1.5</source>
|
|
+ <target>1.5</target>
|
|
</configuration>
|
|
</plugin>
|
|
|
|
diff -Bbur bluecove-2.1.1-SNAPSHOT/pom.xml bluecove-2.1.1-SNAPSHOT-briar/pom.xml
|
|
--- bluecove-2.1.1-SNAPSHOT/pom.xml 2013-01-04 00:43:19.721293788 +0000
|
|
+++ bluecove-2.1.1-SNAPSHOT-briar/pom.xml 2013-01-03 23:17:18.713293930 +0000
|
|
@@ -436,7 +436,7 @@
|
|
<configuration>
|
|
<linkXref>true</linkXref>
|
|
<minimumTokens>100</minimumTokens>
|
|
- <targetJdk>1.4</targetJdk>
|
|
+ <targetJdk>1.5</targetJdk>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|