tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1077 commits 81 branches 117 tags 12 MiB
Commit graph

281 commits

Author SHA1 Message Date
l10n daemon script
633952b638 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-10-27 12:30:00 +00:00
l10n daemon script
dda5ec5385 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-10-26 03:37:32 +00:00
l10n daemon script
4239b0525b 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-10-25 03:57:27 +00:00
Aleix Pol
0bca50af93 Merge branch '0.9' 2015-10-19 17:48:13 +02:00
Albert Vaca
30f00fb3fa Fix a crash where unmount was called again after m_proc had been destroyed 
This happened because of scheduling m_proc->kill() from unmount 5 seconds
after the destructor was called (which was who called unmount first).

Simplified unmount logic a bit as well. Known bug: we might end with a fuse
mountpoint still mounted after killing the sshfs process.

BUG: 352861
 2015-10-17 17:31:17 -07:00
Albert Vaca
6deec3429a Use id instead of a pointer in the dismissRequested signal and slot. 
Also changed connection to the Qt5 way.
 2015-10-17 15:32:13 -07:00
Albert Vaca
4574aa3639 Make the origin also contain the file name, not only the device name 2015-10-17 13:32:57 -07:00
l10n daemon script
c0576f76b1 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-10-13 12:45:08 +00:00
l10n daemon script
c4a499ca01 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-10-12 10:38:12 +00:00
l10n daemon script
1a464d6384 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-10-06 12:36:45 +00:00
l10n daemon script
9f291d9ef7 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-10-02 10:15:24 +00:00
l10n daemon script
47ee991548 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-10-01 10:36:43 +00:00
l10n daemon script
b05a90f090 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-28 10:20:36 +00:00
Albert Vaca
53e6381d30 Fixed warning about using pointers in slots 2015-09-26 08:23:55 -07:00
l10n daemon script
f9db1e0fa5 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-22 12:23:31 +00:00
l10n daemon script
d42bcb25a2 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-19 11:56:19 +00:00
l10n daemon script
d33800a748 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-17 11:59:25 +00:00
l10n daemon script
c1c1166e09 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-16 10:24:01 +00:00
l10n daemon script
42a3029b0e 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-14 10:22:08 +00:00
l10n daemon script
933cbd5bfd 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-13 10:31:01 +00:00
Aleix Pol
27302c0450 Improve RunCommand configuration display 2015-09-12 13:51:15 +02:00
Aleix Pol
f25dc109f3 Don't lock the daemon when running a process is started 2015-09-12 13:51:15 +02:00
l10n daemon script
71874dbffb 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-12 11:52:20 +00:00
Albert Vaca
0f280b5345 Made the runcommands plugin re-send the config when it changes 2015-09-12 04:50:20 -07:00
Aleix Pol
cfe0e60eb9 Remove wrong include 2015-09-12 12:49:43 +02:00
Albert Vaca
cf4a9b8639 First implementation of runcommand plugin 2015-09-12 03:38:44 -07:00
Albert Vaca
b7eefa0388 Fixed warning. 2015-09-12 03:37:05 -07:00
David Edmundson
e5ff128deb Fix typo in library existing check 2015-09-12 11:11:43 +02:00
Aleix Pol
a8a8080248 Prevent detaching temporary objects 
For more info see:
https://blogs.kde.org/2015/05/13/simple-qt-container-optimization-you-should-do-your-code
 2015-09-12 09:53:05 +02:00
Aleix Pol
c6a157e50a Remove unused variable 2015-09-12 09:48:31 +02:00
David Edmundson
d9be8f970c Check for service validity in more places 
BUG: 352582
 2015-09-11 21:46:25 +02:00
David Edmundson
9985a59608 Find my phone plugin 
Add a plugin that sends a package to ring an alarm on a phone

Also adjusts plasmoid to have a button to invoke this.
 2015-09-11 21:12:12 +02:00
Aleix Pol
95f01c4bea Use C++ for setting the default argument 2015-09-11 12:34:52 +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
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
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
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
Albert Vaca
df81ed0a33 Fixed notification flags being overwritten 2015-09-09 01:17:44 -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
Gaël Le Baccon
866fdfb33f Added a simple way to answer SMS messages from the notification 2015-09-08 01:12:01 -07:00
Albert Vaca
b21a4682a9 Fixed notification flags being overwritten 2015-09-08 01:12:00 -07:00