Commit cfdb6437 authored by Laurent Montel's avatar Laurent Montel 😁

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
parent 3615a268
...@@ -46,7 +46,7 @@ void FollowUpReminderShowMessageJob::start() ...@@ -46,7 +46,7 @@ void FollowUpReminderShowMessageJob::start()
if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(kmailInterface)) { if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(kmailInterface)) {
// Program is not already running, so start it // Program is not already running, so start it
QString errmsg; 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; qCDebug(FOLLOWUPREMINDERAGENT_LOG) << " Can not start kmail" << errmsg;
deleteLater(); deleteLater();
return; return;
......
...@@ -386,12 +386,12 @@ install(TARGETS kmailprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELIN ...@@ -386,12 +386,12 @@ install(TARGETS kmailprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELIN
install(TARGETS kmail ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) 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 install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kmail.kcfg ${CMAKE_CURRENT_BINARY_DIR}/kmail.kcfg
DESTINATION ${KDE_INSTALL_KCFGDIR} 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 install(FILES
data/kmail_config_misc.desktop data/kmail_config_misc.desktop
data/kmail_config_appearance.desktop data/kmail_config_appearance.desktop
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component type="desktop"> <component type="desktop">
<id>org.kde.kmail.desktop</id> <id>org.kde.kmail2.desktop</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license> <project_license>GPL-2.0+</project_license>
<name>KMail</name> <name>KMail</name>
......
...@@ -41,7 +41,7 @@ int main(int argc, char **argv) ...@@ -41,7 +41,7 @@ int main(int argc, char **argv)
aboutData.processCommandLine(&parser); aboutData.processCommandLine(&parser);
QString errmsg; 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; qDebug() << " Can not start kmail" << errmsg;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment