a25a696e | 2014-10-11 17:19:24 | Timothy Pearson |
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications |
||
M ark/ark.desktop M ark/ark_part.desktop M kcalc/kcalc.desktop M kcharselect/KCharSelect.desktop M kdf/kcmdf.desktop M kdf/kdf.desktop M kdf/kwikdisk.desktop M kedit/KEdit.desktop M kfloppy/KFloppy.desktop M kfloppy/floppy_format.desktop M kgpg/encryptfile.desktop M kgpg/encryptfolder.desktop M kgpg/kgpg.desktop M kgpg/kgpgoptions.cpp M khexedit/khexedit.desktop M khexedit/parts/kbytesedit/kbyteseditwidget.desktop M khexedit/parts/kpart/khexedit2part.desktop M kjots/Kjots.desktop M klaptopdaemon/applnk/klaptopdaemon.desktop M klaptopdaemon/applnk/laptop.desktop M klaptopdaemon/applnk/pcmcia.desktop M kmilo/asus/kmilo_asus.desktop M kmilo/delli8k/kmilo_delli8k.desktop M kmilo/demo/kmilo_demo.desktop M kmilo/generic/kmilo_generic.desktop M kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop M kmilo/kmilo_kvaio/kmilo_kvaio.desktop M kmilo/kmilod/kmilod.desktop M kmilo/powerbook/kmilo_powerbook.desktop M kmilo/powerbook2/kmilo_powerbook.desktop M kmilo/thinkpad/kcmthinkpad/thinkpad.desktop M kmilo/thinkpad/kmilo_thinkpad.desktop M kregexpeditor/kregexpeditor.desktop M kregexpeditor/kregexpeditorgui.desktop M ksim/ksim.desktop M ktimer/ktimer.desktop M superkaramba/src/superkaramba.desktop M tdelirc/irkick/irkick.desktop M tdelirc/kcmlirc/kcmlirc.desktop M tdewallet/konfigurator/tdewallet_config.desktop M tdewallet/konfigurator/tdewalletconfig.desktop M tdewallet/konfigurator/tdewalletmanager_show.desktop M tdewallet/tdewalletmanager.desktop |
||
diff --git a/ark/ark.desktop b/ark/ark.desktop index 26b2bcf..f0e233c 100644 --- a/ark/ark.desktop +++ b/ark/ark.desktop @@ -77,7 +77,7 @@ Exec=ark -caption "%c" %i %m %U Icon=ark Path= -DocPath=ark/index.html +X-DocPath=ark/index.html Type=Application Terminal=false SwallowExec= diff --git a/ark/ark_part.desktop b/ark/ark_part.desktop index 1d6942c..a736b82 100644 --- a/ark/ark_part.desktop +++ b/ark/ark_part.desktop @@ -131,5 +131,5 @@ Name[zu]=Umqulu Icon=ark Type=Service -ServiceTypes=KParts/ReadOnlyPart +X-TDE-ServiceTypes=KParts/ReadOnlyPart X-TDE-Library=libarkpart diff --git a/kcalc/kcalc.desktop b/kcalc/kcalc.desktop index 1e3b0d0..42419a9 100644 --- a/kcalc/kcalc.desktop +++ b/kcalc/kcalc.desktop @@ -17,7 +17,7 @@ Name[zh_TW]=TDE ��������� Exec=kcalc -caption "%c" %i %m Icon=kcalc -DocPath=kcalc/index.html +X-DocPath=kcalc/index.html GenericName=Scientific Calculator GenericName[af]=Wetenskaplike Sakrekenaar GenericName[ar]=������ ���������� ���������� diff --git a/kcharselect/KCharSelect.desktop b/kcharselect/KCharSelect.desktop index 8e51f90..300a46e 100644 --- a/kcharselect/KCharSelect.desktop +++ b/kcharselect/KCharSelect.desktop @@ -72,7 +72,7 @@ Path= Type=Application Terminal=false -DocPath=kcharselect/index.html +X-DocPath=kcharselect/index.html Name=KCharSelect Name[af]=Kcharselect Name[cy]=KDewisNod diff --git a/kdf/kcmdf.desktop b/kdf/kcmdf.desktop index 2bee9d0..6cc4943 100644 --- a/kdf/kcmdf.desktop +++ b/kdf/kcmdf.desktop @@ -68,7 +68,7 @@ Name[zh_CN]=������������ Name[zh_TW]=������������ Name[zu]=Amathuluzi Ethala -DocPath=kcontrol/storagedevices/index.html +X-DocPath=kcontrol/storagedevices/index.html Comment=Shows the disk usage of the mounted devices Comment[af]=Vertoon die disket gebruik van die gekoppelde toestelle Comment[ar]=�������� �������������� ������������������ ���� �������������� ���������������� diff --git a/kdf/kdf.desktop b/kdf/kdf.desktop index c9876de..fdbd0ad 100644 --- a/kdf/kdf.desktop +++ b/kdf/kdf.desktop @@ -82,7 +82,7 @@ GenericName[zh_TW]=������������������������ GenericName[zu]= Buka Ukusetshenziswa Kwediski Terminal=false -DocPath=kdf/index.html +X-DocPath=kdf/index.html X-TDE-StartupNotify=true X-DCOP-ServiceType=Multi Categories=Qt;TDE;System; diff --git a/kdf/kwikdisk.desktop b/kdf/kwikdisk.desktop index 5a4591c..c9f596f 100644 --- a/kdf/kwikdisk.desktop +++ b/kdf/kwikdisk.desktop @@ -13,7 +13,7 @@ Exec=kwikdisk -caption "%c" Icon=kwikdisk Type=Application -DocPath=kdf/index.html +X-DocPath=kdf/index.html GenericName=Removable Media Utility GenericName[af]=Verwyderbare Media Program GenericName[ar]=�������� �������������� �������������� �������������� diff --git a/kedit/KEdit.desktop b/kedit/KEdit.desktop index 8cb6624..52748c5 100644 --- a/kedit/KEdit.desktop +++ b/kedit/KEdit.desktop @@ -58,7 +58,7 @@ Exec=kedit -caption "%c" %i %m %u Icon=kedit Path= -DocPath=kedit/index.html +X-DocPath=kedit/index.html Type=Application Terminal=false Name=KEdit diff --git a/kfloppy/KFloppy.desktop b/kfloppy/KFloppy.desktop index 670052e..d2f335e 100644 --- a/kfloppy/KFloppy.desktop +++ b/kfloppy/KFloppy.desktop @@ -85,7 +85,7 @@ Name[wa]=KPlakete Name[zh_TW]=TDE ������ MimeType= -DocPath=kfloppy/index.html +X-DocPath=kfloppy/index.html Exec=kfloppy -caption "%c" %i %m Icon=kfloppy Path= diff --git a/kfloppy/floppy_format.desktop b/kfloppy/floppy_format.desktop index 3e42930..847c6ca 100644 --- a/kfloppy/floppy_format.desktop +++ b/kfloppy/floppy_format.desktop @@ -49,6 +49,6 @@ [Desktop Entry] Actions=Format; -ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted +X-TDE-ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted X-TDE-Priority=TopLevel X-TDE-MediaNotifierHide=true diff --git a/kgpg/encryptfile.desktop b/kgpg/encryptfile.desktop index c117c30..382fa3d 100644 --- a/kgpg/encryptfile.desktop +++ b/kgpg/encryptfile.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -ServiceTypes=all/allfiles -ExcludeServiceTypes=kdedevice/* +X-TDE-ServiceTypes=all/allfiles +X-TDE-ExcludeServiceTypes=kdedevice/* Actions=encrypt [Desktop Action encrypt] diff --git a/kgpg/encryptfolder.desktop b/kgpg/encryptfolder.desktop index 60083ba..0945f9b 100644 --- a/kgpg/encryptfolder.desktop +++ b/kgpg/encryptfolder.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=inode/directory +X-TDE-ServiceTypes=inode/directory Actions=encrypt [Desktop Action encrypt] diff --git a/kgpg/kgpg.desktop b/kgpg/kgpg.desktop index aff01e4..112088e 100644 --- a/kgpg/kgpg.desktop +++ b/kgpg/kgpg.desktop @@ -2,7 +2,7 @@ Type=Application Exec=kgpg %U Icon=kgpg -DocPath=kgpg/index.html +X-DocPath=kgpg/index.html MimeType=application/pgp-encrypted;application/pgp-signature;application/pgp-keys; GenericName=Encryption Tool GenericName[ar]=�������� �������������� diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 37533ae..b1301d8 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -450,7 +450,7 @@ KDesktopFile configl2(path, false); if (configl2.isImmutable() ==false) { configl2.setGroup("Desktop Entry"); - configl2.writeEntry("ServiceTypes", mimetype); + configl2.writeEntry("X-TDE-ServiceTypes", mimetype); configl2.writeEntry("Actions", "sign"); configl2.setGroup("Desktop Action sign"); configl2.writeEntry("Name",i18n("Sign File")); @@ -467,7 +467,7 @@ KDesktopFile configl2(path, false); if (configl2.isImmutable() ==false) { configl2.setGroup("Desktop Entry"); - configl2.writeEntry("ServiceTypes", mimetype); + configl2.writeEntry("X-TDE-ServiceTypes", mimetype); configl2.writeEntry("Actions", "decrypt"); configl2.setGroup("Desktop Action decrypt"); configl2.writeEntry("Name",i18n("Decrypt File")); diff --git a/khexedit/khexedit.desktop b/khexedit/khexedit.desktop index 23c03da..edcd3d5 100644 --- a/khexedit/khexedit.desktop +++ b/khexedit/khexedit.desktop @@ -78,7 +78,7 @@ Icon=khexedit Path= Type=Application -DocPath=khexedit/index.html +X-DocPath=khexedit/index.html Terminal=false X-TDE-StartupNotify=true X-DCOP-ServiceType=Multi diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.desktop b/khexedit/parts/kbytesedit/kbyteseditwidget.desktop index f0dd8ab..acaad7d 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.desktop +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.desktop @@ -47,6 +47,6 @@ Name[zh_CN]=������������������ Name[zh_TW]=��������������������� X-TDE-Library=libkbyteseditwidget -InitialPreference=2 -ServiceTypes=KHexEdit/KBytesEdit +X-TDE-InitialPreference=2 +X-TDE-ServiceTypes=KHexEdit/KBytesEdit diff --git a/khexedit/parts/kpart/khexedit2part.desktop b/khexedit/parts/kpart/khexedit2part.desktop index b624953..63ef55a 100644 --- a/khexedit/parts/kpart/khexedit2part.desktop +++ b/khexedit/parts/kpart/khexedit2part.desktop @@ -96,6 +96,6 @@ Comment[zh_TW]=��������������������������� #MimeType=all/allfiles MimeType=application/octet-stream -ServiceTypes=KParts/ReadOnlyPart,Browser/View +X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View #,KParts/ReadWritePart X-TDE-Library=libkhexedit2part diff --git a/kjots/Kjots.desktop b/kjots/Kjots.desktop index adc01d9..4980053 100644 --- a/kjots/Kjots.desktop +++ b/kjots/Kjots.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -DocPath=kjots/index.html +X-DocPath=kjots/index.html Name=KJots Name[af]=Kjots Name[eo]=Notlibro diff --git a/klaptopdaemon/applnk/klaptopdaemon.desktop b/klaptopdaemon/applnk/klaptopdaemon.desktop index 4a27176..c369af9 100644 --- a/klaptopdaemon/applnk/klaptopdaemon.desktop +++ b/klaptopdaemon/applnk/klaptopdaemon.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Service -ServiceTypes=KDEDModule +X-TDE-ServiceTypes=KDEDModule X-TDE-ModuleType=Library X-TDE-Library=klaptopdaemon X-TDE-FactoryName=klaptopdaemon @@ -9,7 +9,7 @@ X-TDE-Kded-load-on-demand=true ** Diff limit reached (max: 250 lines) ** |