Albert Vaca
89afa5b9af
Renamed capabilties so we don't clash with KDE4's broken implementation
2015-09-11 06:20:15 -07:00
Aleix Pol
47147c5fa1
Merge branch 'stable'
2015-09-11 14:04:54 +02:00
Aleix Pol
c2acc37da6
Fix filtering of plugins that don't support capabilities
2015-09-11 14:00:15 +02:00
Albert Vaca
ea253b1755
Merge branch 'stable'
2015-09-11 04:35:41 -07:00
Albert Vaca
825a02f76a
Fixed compilation error because QCA doesn't include QIODevice
2015-09-11 04:35:22 -07:00
David Edmundson
8d3c5441ed
Tone down the debug
2015-09-11 12:57:47 +02:00
Aleix Pol
95f01c4bea
Use C++ for setting the default argument
2015-09-11 12:34:52 +02:00
Aleix Pol
ca4a81b8e8
Merge branch 'stable'
2015-09-11 12:24:15 +02:00
Aleix Pol
2b8a54357e
Remove redundant copy constructor
2015-09-11 12:22:59 +02:00
Aleix Pol
67c5a2b5f1
Fix variable scope
2015-09-11 12:22:35 +02:00
Aleix Pol
c62fac0bcf
Don't join hte interfaces in 1 string
...
Let NetworkPackage do the serialization
2015-09-11 12:14:19 +02:00
David Edmundson
75b8e24727
Fix compilation on newer TpQt
2015-09-11 12:08:50 +02:00
Albert Vaca
25d19fe9ca
Merge branch 'stable'
2015-09-11 03:06:52 -07:00
Albert Vaca
bb0b5fcf44
Were connecting to the wrong slot
2015-09-11 03:06:26 -07:00
Albert Vaca
4c98e2e7b3
Less verbose output
2015-09-11 02:29:57 -07:00
David Edmundson
25944356fc
Merge branch 'stable'
2015-09-11 11:29:31 +02:00
David Edmundson
d621000621
Watch all serivies with the watcher
...
media player services are not registered as org.mpris.MediaPlayer2 just
use a service name that starts with that. We need to watch all services
and then filter.
BUG: 352529
Reviewed-by: Albert Vaca
2015-09-11 11:27:35 +02:00
Albert Vaca
b07e442b97
Less verbose plugin loader
2015-09-11 01:12:34 -07:00
Albert Vaca
4df14d1c7d
Fixed plugins without incoming nor outgoing packages being disabled
2015-09-11 01:12:22 -07:00
David Edmundson
2c0a138257
Check PendingReady return values
...
Apparently you can get a valid accountset without a valid filter, which
then crashes
BUG: 352532
2015-09-10 21:51:08 +02:00
David Edmundson
e4cbf22519
Telepathy integration
...
This sends recieved text messages to any Telepathy client and allows the
user to respond from there.
This should work with both our clients and Empathy.
An account on telepathy is created on activation.
As Telepathy clients expect backends to be always running, this is
started by the daemon to
suppress client errors. The plugin system then talks to the same CM via
use of a singleton accessor.
Based on work by Alexandr Akulich then tidied up and rebased.
2015-09-10 20:36:46 +02:00
Aleix Pol
501e5431ec
Merge branch 'stable'
2015-09-10 20:26:43 +02:00
Aleix Pol
972c260628
Make sure kdeconnectd gets started when required
...
BUG: 352522
BUG: 352520
2015-09-10 20:21:41 +02:00
Albert Vaca
d0f1bfde0c
Disabled more plugins that won't work on Windows
...
PauseMusic and MprisControl require MPRIS
Screensaver-inhibit requires freedesktop's screensaver dbus interface
Sftp needs SSHFS
2015-09-10 07:55:38 -07:00
Patrick von Reth
da5c9bd30e
Fix compilation on Windows.
2015-09-10 15:51:38 +02:00
l10n daemon script
5795e27191
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-09-10 11:33:23 +00:00
Aleix Pol
361fbbd81d
Adapt kdeconnect-cli to changes in core
2015-09-09 23:22:59 +02:00
Aleix Pol
4cccb7344a
++verbosity on error
2015-09-09 20:12:16 +02:00
Aleix Pol
fc074c8ec8
Fix tests
...
Ensure the loopback device is paired
2015-09-09 20:12:05 +02:00
Aleix Pol
a9d2840664
Use acquire and release instead of a boolean property
...
This way we hope we won't end up without discovery if 2 instances need
discovery at the same time.
Reviewed by Albert Vaca
2015-09-09 20:09:04 +02:00
Aleix Pol
32daa4e51f
Fix misbehaviour
...
Delete devices, not links
2015-09-09 13:42:28 +02:00
Aleix Pol
77e92262fe
Fix build
2015-09-09 13:03:08 +02:00
Aleix Pol
26b0ec8b98
Make sure we don't disconnect from discovering remotes
...
Otherwise it's hard to let other devices connect to us, without having both
devices in discoverability mode.
Reviewed by Albert Vaca
2015-09-09 13:01:38 +02:00
l10n daemon script
a50607939d
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-09-09 10:15:45 +00:00
Albert Vaca
c65be84a89
Only send capabilities packets for paired devices
2015-09-09 01:19:38 -07:00
Albert Vaca
df81ed0a33
Fixed notification flags being overwritten
2015-09-09 01:17:44 -07:00
Aleix Pol
acdd96c431
Fix device lookup on the tests
2015-09-08 20:11:52 +02:00
Aleix Pol
a0da8ba858
Let the KPluginSelector react to changes in the plugin configuration
...
Mainly whenever the remote capabilities change.
Reviewed by The Vaca Man
2015-09-08 20:03:44 +02:00
Aleix Pol
b101e828a4
Fix capabilities detection
...
Only consider capabilities as unsupported if both incoming and outgoing are
empty, rather than either.
Reviewed by Albert Vaca
2015-09-08 17:58:40 +02:00
Aleix Pol
b9c427a316
fix crash and simplify code
...
reviewed by Albert Vaca
2015-09-08 17:57:55 +02:00
Aleix Pol
6a379e9227
Rename missingPlugins to unsupportedPlugins
2015-09-08 17:38:33 +02:00
Aleix Pol
617b66aeb8
small code simplification
...
removes changes from list to set
always uses the same path for figuring out the interfaces.
reviewed by Albert Vaca
2015-09-08 17:35:30 +02:00
Aleix Pol
df3581459a
Add a test that makes sure that capabilities are gathered correctly
...
While at it, fix the logic, because it wasn't working all that well.
Reviewed by Albert Vaca
2015-09-08 17:35:30 +02:00
Albert Vaca
854e4227fa
Read the capabilities in the first addLink instead of only the constructor
2015-09-08 08:37:43 -07:00
l10n daemon script
af97d4476c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2015-09-08 12:50:45 +00:00
Aleix Pol
253e8b410c
Clang modernize
2015-09-08 11:14:31 +02:00
Aleix Pol
817fcbc9d6
Merge branch 'stable'
2015-09-08 10:51:41 +02:00
Aleix Pol
d58f6314fe
run Clang Modernize
...
Minus the auto change
2015-09-08 10:47:37 +02:00
David Edmundson
0ab80568b7
Merge branch 'stable'
2015-09-08 10:34:13 +02:00
David Edmundson
9ca9833e9c
Handle strings and better utf8 in mousepad plugin
2015-09-08 10:27:41 +02:00
