Commit graph

1144 commits

Author SHA1 Message Date
Rex Dieter
d187dc5beb fix NotShowIn, "Plasma" is not valid or used 2015-08-26 07:12:05 -05:00
Rex Dieter
b930a905f2 use LIBEXEC_INSTALL_DIR consistently (without CMAKE_INSTAL_PREFIX) 2015-08-26 07:01:35 -05:00
Albert Vaca
bc3fb512d4 Fixed incompatibility with OpenSSH 7.0
BUG: 351725
2015-08-24 21:27:24 -07:00
Vineet Garg
78e9c08732 Merge branch 'master' into ssl
Conflicts:
	core/backends/lan/socketlinereader.h
	core/backends/lan/uploadjob.h
	core/networkpackage.h
2015-08-25 03:43:41 +05:30
Vineet Garg
17da38e5ba Explicity using TLSv1 because using AnyProtocol causes a default TLSv1.2 handshake which not supported on older android version
Was using QueryPeer instead of VerifyPeer of isDeviceTrusted of connected slot
2015-08-25 01:14:24 +05:30
Boris Egorov
1924173df2 Fix various krazy2 warnings
Fix following krazy2 warning types:
[explicit], [endswithnewline], [doublequote_chars], [includes], [normalize],
[postfixop], [spelling]

See http://ebn.kde.org/krazy/reports/playground/base/kdeconnect-kde/index.html
for details.

SLOT/SIGNAL normalization done with Qt normalize utility:
https://github.com/qtproject/qtrepotools/tree/master/util/normalize

REVIEW: 124857
2015-08-21 22:38:54 +06:00
Vineet Garg
9799c629d2 Added device test 2015-08-20 23:15:12 +05:30
Vineet Garg
44c0ec1c78 If remote device certificate is changes, in sslError due to simulataneous multiple connections, unpair was called on null pointer 2015-08-17 20:04:41 +05:30
Vineet Garg
eff84a49d4 We support any protocol instead of TLSv1.2 2015-08-16 21:19:56 +05:30
Vineet Garg
9bc93b6337 We generate certificate from present date -1 year to present date + 10 year, this avoids the case where certificate is not valid due to difference of time zones 2015-08-14 17:50:58 +05:30
Vineet Garg
75bd15ed65 Added default value while checking for link name in pairing handler, this provides backward compatibility 2015-08-14 17:33:08 +05:30
Vineet Garg
6fe1399a18 Fixed minor issues in pairing handler 2015-08-13 14:56:28 +05:30
Vineet Garg
c5a399b94b Fixed code identation issue 2015-08-12 23:49:15 +05:30
Vineet Garg
c2e8441c67 Merge branch 'master' into pairinghandler 2015-08-12 23:44:11 +05:30
Vineet Garg
6acb4204a2 Added KdeConnectConfigTest, TestSslSocketLineReader, LanLinkProviderTest 2015-08-12 23:42:27 +05:30
l10n daemon script
ce354aae44 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-08-11 13:21:00 +00:00
Vineet Garg
cf3d37b504 Fixed issue pointed out on RR
Fixed some pairing handler issues
2015-08-11 09:04:02 +05:30
l10n daemon script
f3411bb8dd 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-08-10 10:15:07 +00:00
Aleix Pol
a2aa2ab72b Fix qml touchpad interface
On release, forget about the last position
2015-08-07 15:02:36 +02:00
Aleix Pol
84f93ad0b5 Eh... copypaste 2015-08-07 15:02:06 +02:00
l10n daemon script
6dc0c048e2 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-08-06 10:23:02 +00:00
l10n daemon script
43161b3932 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-08-01 10:37:53 +00:00
Àlex Fiestas
886787f732 Set a valid url for UDS_URL, basically one that includes files://
In Qt5 QUrl need to be created by calling fromLocalFile to handle
paths such /root/foo.txt.
So KIO apparently broke compatibility with setting such paths in
UDS_URL and we have to pass instead files:///root/foo.txt

Altought this might be a bug in KIO, we want to work with all KF5 based
versions of plasma and this patch will just do that.

REVIEW:124544
2015-07-31 13:01:24 +02:00
Àlex Fiestas
4acfaa8b12 Remove trailing spaces and lines 2015-07-31 11:39:58 +02:00
l10n daemon script
a0aa62dd04 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-07-29 09:16:57 +00:00
Vineet Garg
06d8b3c54e Merge branch 'master' into pairinghandler 2015-07-27 21:00:05 +05:30
Vineet Garg
2824e73617 Pairing handler implemented 2015-07-27 20:58:58 +05:30
l10n daemon script
b37582308a 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-07-26 09:31:02 +00:00
Vineet Garg
27515546a0 Now per device per link type pairing handlers are there 2015-07-25 17:15:19 +05:30
l10n daemon script
121b6ee64a 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-07-25 11:30:20 +00:00
l10n daemon script
bf51ceb600 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-07-24 09:52:53 +00:00
l10n daemon script
647d09b6fc 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-07-23 10:34:29 +00:00
Martin Gräßlin
208cc573d2 [app] Add a title on the ApplicationWindow
Without a title, it's not possible to identify the window on Wayland.
E.g. KWin doesn't have a title for the application in Present Windows
or application switchers filtering it out.

REVIEW: 124417
2015-07-22 15:50:20 +02:00
l10n daemon script
eb5c099661 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-07-22 10:07:40 +00:00
Martin Gräßlin
56b6c019dc [app] Do not runtime depend on Qt 5.5
Reviewed-By: apol
2015-07-22 12:06:49 +02:00
Aleix Pol
be2a3252c2 Make it possible to lock the screen from KDE Connect
Connects to freedesktop ScreenSaver interface and un/locks it upon request.

REVIEW: 124170
2015-07-22 03:37:34 +02:00
Aleix Pol
b99ac42ede Fix geninterface usage 2015-07-22 03:21:28 +02:00
Aleix Pol
c98413d5d1 Fix capabilities of the mousepad plugin
It doesn't send packages, so no need to require kdeconnect.mousepad.
2015-07-22 03:21:28 +02:00
Aleix Pol
058f7c7c90 Implement the touchpad forwarding into kcapp
This way the computer's cursor can be controlled from the device. Keyboard
is not yet implemented.
2015-07-22 03:21:28 +02:00
l10n daemon script
a794d51c4e 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-07-21 15:07:44 +00:00
Alexander Potashev
ca1d99e261 plugins/mousepad: At least KF5::Wayland 5.3.90 is required
Fake input interface was added to KF5::Wayland only a couple of weeks
ago, it has not been released yet with this feature.

CCMAIL: mgraesslin@kde.org
2015-07-21 04:48:29 +03:00
Aleix Pol
2b844e59da Improve app mpris interface 2015-07-19 22:20:47 +02:00
Vineet Garg
98d3cf46a6 Merge branch 'master' into newssl 2015-07-19 22:00:24 +05:30
Vineet Garg
1b430db4a3 Fixed indentation 2015-07-19 21:59:27 +05:30
Vineet Garg
eda2563d03 Fixed encryption info in cli 2015-07-19 20:25:28 +05:30
Lamarque V. Souza
38aa9704a7 Only deletes dbus interfaces for the same device that had created it. 2015-07-18 17:13:51 -03:00
Vineet Garg
20e46418ba Encryption info in cli 2015-07-18 18:54:10 +05:30
Lamarque V. Souza
208c11de1a Fix battery widget not appearing after kdeconnectd restarts.
I also added a workaround to prevent memory leak described in
0f38eb34a4.

REVIEW: 124361
2015-07-17 00:40:45 -03:00
Lamarque V. Souza
1c764c55a3 Fix typo. 2015-07-14 19:55:32 -03:00
Vineet Garg
e6da860fb7 Fixed issues pointed out on CR 2015-07-14 17:34:04 +05:30