From f1f6ae7a3ec35e289df1f45cd47e71bd3c696fbe Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 18 Aug 2023 05:11:16 +0300 Subject: [PATCH] generic: replace X-KDE-StartupNotify with StartupNotify X-KDE-StartupNotify is for compatibility and used as fallback (in case StartupNotify is not set) Signed-off-by: Ivailo Monev --- kate/src/data/kate.desktop | 2 +- kfind/kfind.desktop | 2 +- kglobalaccel/kglobalaccel.desktop | 2 +- kinfocenter/kinfocenter.desktop | 2 +- klipper/klipper.desktop | 2 +- kmenuedit/basictab.cpp | 5 +---- kmenuedit/kmenuedit.desktop | 2 +- knetattach/knetattach.desktop | 2 +- knotify/knotify4.desktop | 2 +- konsole/desktop/konsole.desktop | 2 +- krunner/krunner.desktop | 2 +- ksysguard/gui/ksysguard.desktop | 2 +- kuiserver/kuiserver.desktop | 2 +- plasma/shells/plasma-desktop/data/plasma-desktop.desktop | 2 +- systemsettings/app/kdesystemsettings.desktop | 2 +- systemsettings/app/systemsettings.desktop | 2 +- 16 files changed, 16 insertions(+), 19 deletions(-) diff --git a/kate/src/data/kate.desktop b/kate/src/data/kate.desktop index f6b43532..b4334a53 100755 --- a/kate/src/data/kate.desktop +++ b/kate/src/data/kate.desktop @@ -119,7 +119,7 @@ Name[zh_CN]=Kate Name[zh_TW]=Kate MimeType=text/plain; Exec=kate --icon '%i' --caption '%c' -b %U -X-KDE-StartupNotify=true +StartupNotify=true X-KDE-HasTempFileOption=true Icon=kate X-DocPath=kate/index.html diff --git a/kfind/kfind.desktop b/kfind/kfind.desktop index 0f03c3e9..0125809f 100755 --- a/kfind/kfind.desktop +++ b/kfind/kfind.desktop @@ -94,6 +94,6 @@ Name[wa]=Trover des fitchîs/ridants Name[x-test]=xxFind Files/Foldersxx Name[zh_CN]=查找文件/文件夹 Name[zh_TW]=尋找檔案/資料夾 -X-KDE-StartupNotify=true +StartupNotify=true OnlyShowIn=KDE; Categories=Qt;KDE;Core; diff --git a/kglobalaccel/kglobalaccel.desktop b/kglobalaccel/kglobalaccel.desktop index 119830e8..8121bc3c 100644 --- a/kglobalaccel/kglobalaccel.desktop +++ b/kglobalaccel/kglobalaccel.desktop @@ -6,7 +6,7 @@ X-KDE-autostart-phase=1 X-DBUS-ServiceName=org.kde.kglobalaccel X-DBUS-StartupType=Unique X-KDE-ServiceTypes= -X-KDE-StartupNotify=false +StartupNotify=false Name=KDED Global Shortcuts Server Name[ar]=خادم اختصارات كدي دي العمومية diff --git a/kinfocenter/kinfocenter.desktop b/kinfocenter/kinfocenter.desktop index b9fe3de7..094154a5 100755 --- a/kinfocenter/kinfocenter.desktop +++ b/kinfocenter/kinfocenter.desktop @@ -3,7 +3,7 @@ Exec=kinfocenter --icon '%i' --caption '%c' Icon=hwinfo Type=Application X-DocPath=kinfocenter/index.html -X-KDE-StartupNotify=true +StartupNotify=true OnlyShowIn=KDE; Name=KInfoCenter diff --git a/klipper/klipper.desktop b/klipper/klipper.desktop index c3eb0c25..d3707888 100755 --- a/klipper/klipper.desktop +++ b/klipper/klipper.desktop @@ -182,7 +182,7 @@ Icon=klipper Type=Application X-DocPath=klipper/index.html Terminal=false -X-KDE-StartupNotify=false +StartupNotify=false X-DBUS-ServiceName=org.kde.klipper X-DBUS-StartupType=Unique X-KDE-UniqueApplet=true diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index a75169c2..d2f7aaa0 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -385,10 +385,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo) _termOptEdit->setText(df->desktopGroup().readEntry("TerminalOptions")); _uidEdit->setText(df->desktopGroup().readEntry("X-KDE-Username")); - if( df->desktopGroup().hasKey( "StartupNotify" )) - _launchCB->setChecked(df->desktopGroup().readEntry("StartupNotify", true)); - else // backwards comp. - _launchCB->setChecked(df->desktopGroup().readEntry("X-KDE-StartupNotify", true)); + _launchCB->setChecked(df->desktopGroup().readEntry("StartupNotify", true)); _onlyShowInKdeCB->setChecked( df->desktopGroup().readXdgListEntry("OnlyShowIn").contains( "KDE" ) ); // or maybe enable only if it contains nothing but KDE? diff --git a/kmenuedit/kmenuedit.desktop b/kmenuedit/kmenuedit.desktop index 8923d7cc..4d59bbb7 100755 --- a/kmenuedit/kmenuedit.desktop +++ b/kmenuedit/kmenuedit.desktop @@ -3,7 +3,7 @@ Exec=kmenuedit --icon '%i' --caption '%c' Icon=kmenuedit X-DocPath=kmenuedit/index.html Type=Application -X-KDE-StartupNotify=true +StartupNotify=true OnlyShowIn=KDE; Name=Menu Editor diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop index 5a1b7899..4b5b5825 100755 --- a/knetattach/knetattach.desktop +++ b/knetattach/knetattach.desktop @@ -182,7 +182,7 @@ InitialPreference=6 Icon=knetattach Type=Application Terminal=false -X-KDE-StartupNotify=true +StartupNotify=true Categories=Qt;KDE;Network;RemoteAccess; X-DocPath=knetattach/index.html OnlyShowIn=KDE; diff --git a/knotify/knotify4.desktop b/knotify/knotify4.desktop index a204c668..f0c8e3a7 100644 --- a/knotify/knotify4.desktop +++ b/knotify/knotify4.desktop @@ -176,5 +176,5 @@ Comment[zh_TW]=KDE Notification 伺服程式 Icon=preferences-desktop-notification X-DBUS-ServiceName=org.kde.knotify X-DBUS-StartupType=Unique -X-KDE-StartupNotify=false +StartupNotify=false X-KDE-MediaPlayer=knotify diff --git a/konsole/desktop/konsole.desktop b/konsole/desktop/konsole.desktop index 2185e233..1ae80d3b 100755 --- a/konsole/desktop/konsole.desktop +++ b/konsole/desktop/konsole.desktop @@ -9,7 +9,7 @@ Actions=NewWindow; X-DocPath=konsole/index.html X-DBUS-ServiceName=org.kde.konsole X-DBUS-StartupType=Multi -X-KDE-StartupNotify=true +StartupNotify=true Name=Konsole Name[af]=Konsole diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop index fc546683..2f13cbf3 100644 --- a/krunner/krunner.desktop +++ b/krunner/krunner.desktop @@ -81,6 +81,6 @@ Name[x-test]=xxCommand Runnerxx Name[zh_CN]=命令运行器 Name[zh_TW]=命令執行者 Type=Service -X-KDE-StartupNotify=false +StartupNotify=false OnlyShowIn=KDE; X-KDE-autostart-phase=1 diff --git a/ksysguard/gui/ksysguard.desktop b/ksysguard/gui/ksysguard.desktop index a306fedd..ba55f37a 100755 --- a/ksysguard/gui/ksysguard.desktop +++ b/ksysguard/gui/ksysguard.desktop @@ -173,7 +173,7 @@ Type=Application MimeType=application/x-ksysguard; X-DocPath=ksysguard/index.html Terminal=false -X-KDE-StartupNotify=true +StartupNotify=true X-DBUS-ServiceName=org.kde.ksysguard X-DBUS-StartupType=Multi Categories=Qt;KDE;System; diff --git a/kuiserver/kuiserver.desktop b/kuiserver/kuiserver.desktop index 35f2a4c0..f0b3ab46 100644 --- a/kuiserver/kuiserver.desktop +++ b/kuiserver/kuiserver.desktop @@ -168,4 +168,4 @@ X-KDE-ServiceTypes= X-DBUS-ServiceName=org.kde.kuiserver # It is a server X-DBUS-StartupType=Unique -X-KDE-StartupNotify=false +StartupNotify=false diff --git a/plasma/shells/plasma-desktop/data/plasma-desktop.desktop b/plasma/shells/plasma-desktop/data/plasma-desktop.desktop index 4fb2b22f..bac63939 100644 --- a/plasma/shells/plasma-desktop/data/plasma-desktop.desktop +++ b/plasma/shells/plasma-desktop/data/plasma-desktop.desktop @@ -73,7 +73,7 @@ Name[x-test]=xxPlasma Desktop Workspacexx Name[zh_CN]=Plasma 桌面工作空间 Name[zh_TW]=Plasma 桌面工作空間 Type=Service -X-KDE-StartupNotify=false +StartupNotify=false OnlyShowIn=KDE; X-KDE-autostart-phase=0 diff --git a/systemsettings/app/kdesystemsettings.desktop b/systemsettings/app/kdesystemsettings.desktop index a26d04ee..b58965f6 100755 --- a/systemsettings/app/kdesystemsettings.desktop +++ b/systemsettings/app/kdesystemsettings.desktop @@ -2,7 +2,7 @@ Exec=systemsettings --icon '%i' --caption '%c' Icon=preferences-system Type=Application -X-KDE-StartupNotify=true +StartupNotify=true NotShowIn=KDE; GenericName=KDE System Settings diff --git a/systemsettings/app/systemsettings.desktop b/systemsettings/app/systemsettings.desktop index 82d2df7f..5452d00e 100755 --- a/systemsettings/app/systemsettings.desktop +++ b/systemsettings/app/systemsettings.desktop @@ -3,7 +3,7 @@ Exec=systemsettings --icon '%i' --caption '%c' Icon=preferences-system Type=Application X-DocPath=systemsettings/index.html -X-KDE-StartupNotify=true +StartupNotify=true OnlyShowIn=KDE; GenericName=System Settings