summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-08 14:38:49 +0200
committerMontel Laurent <[email protected]>2017-04-08 14:38:49 +0200
commitcfdb64378e5e1a6dfeccf0034e0e979d55772f9a (patch)
tree3088b1cd0327037d486854319623df5a06db9589
parent3615a26899a65ef9bac5a8c483776e6b05097c1e (diff)
Apply patch from David Faure
This fixes the desktop filename not matching the qApp name, which makes it harder for libtaskmanager to find out the icon for the running kmail. (see https://phabricator.kde.org/D4600) Differential Revision: https://phabricator.kde.org/D4668
-rw-r--r--agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp2
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/data/org.kde.kmail2.appdata.xml (renamed from src/data/org.kde.kmail.appdata.xml)2
-rwxr-xr-xsrc/data/org.kde.kmail2.desktop (renamed from src/data/org.kde.kmail.desktop)0
-rw-r--r--src/tests/ktoolinvocationtest.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp b/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
index f47aa84..c30169f 100644
--- a/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
+++ b/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
@@ -46,7 +46,7 @@ void FollowUpReminderShowMessageJob::start()
if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(kmailInterface)) {
// Program is not already running, so start it
QString errmsg;
- if (KToolInvocation::startServiceByDesktopName(QStringLiteral("org.kde.kmail"), QString(), &errmsg)) {
+ if (KToolInvocation::startServiceByDesktopName(QStringLiteral("org.kde.kmail2"), QString(), &errmsg)) {
qCDebug(FOLLOWUPREMINDERAGENT_LOG) << " Can not start kmail" << errmsg;
deleteLater();
return;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3fecde2..b9bdb77 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -386,12 +386,12 @@ install(TARGETS kmailprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELIN
install(TARGETS kmail ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS data/org.kde.kmail.desktop data/kmail_view.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(PROGRAMS data/org.kde.kmail2.desktop data/kmail_view.desktop DESTINATION ${KDE_INSTALL_APPDIR})
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kmail.kcfg
DESTINATION ${KDE_INSTALL_KCFGDIR}
)
-install(FILES data/org.kde.kmail.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
+install(FILES data/org.kde.kmail2.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install(FILES
data/kmail_config_misc.desktop
data/kmail_config_appearance.desktop
diff --git a/src/data/org.kde.kmail.appdata.xml b/src/data/org.kde.kmail2.appdata.xml
index 792d4bc..a8ec80f 100644
--- a/src/data/org.kde.kmail.appdata.xml
+++ b/src/data/org.kde.kmail2.appdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
- <id>org.kde.kmail.desktop</id>
+ <id>org.kde.kmail2.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>KMail</name>
diff --git a/src/data/org.kde.kmail.desktop b/src/data/org.kde.kmail2.desktop
index da91e5c..da91e5c 100755
--- a/src/data/org.kde.kmail.desktop
+++ b/src/data/org.kde.kmail2.desktop
diff --git a/src/tests/ktoolinvocationtest.cpp b/src/tests/ktoolinvocationtest.cpp
index 05e35b2..7538dd8 100644
--- a/src/tests/ktoolinvocationtest.cpp
+++ b/src/tests/ktoolinvocationtest.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
aboutData.processCommandLine(&parser);
QString errmsg;
- if (KToolInvocation::startServiceByDesktopName(QStringLiteral("org.kde.kmail"), QString(), &errmsg)) {
+ if (KToolInvocation::startServiceByDesktopName(QStringLiteral("org.kde.kmail2"), QString(), &errmsg)) {
qDebug() << " Can not start kmail" << errmsg;
}