From d3a117d38e35efad3ae12cfdadf84586b051caa1 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 8 Jun 2012 16:28:38 -0500 Subject: [PATCH] Update XDG information in support of bug report 892. --- acinclude.m4 | 2 +- file-integration/basketthumbcreator.desktop | 2 +- kontact_plugin/basket.desktop | 22 ++++++++++----------- kontact_plugin/basket_v4.desktop | 22 ++++++++++----------- src/basket.desktop | 2 +- src/basket_config_apps.desktop | 16 +++++++-------- src/basket_config_baskets.desktop | 16 +++++++-------- src/basket_config_general.desktop | 16 +++++++-------- src/basket_config_new_notes.desktop | 16 +++++++-------- src/basket_config_notes_appearance.desktop | 16 +++++++-------- src/basket_part.desktop | 2 +- src/softwareimporters.cpp | 2 +- 12 files changed, 67 insertions(+), 67 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index ce382d1..d8f4dff 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -489,7 +489,7 @@ if test "$1" = "default"; then kde_widgetdir='\${libdir}/trinity/plugins/designer' fi if test -z "$xdg_appsdir"; then - xdg_appsdir='\${datadir}/applications/kde' + xdg_appsdir='\${datadir}/applications/tde' fi if test -z "$xdg_menudir"; then xdg_menudir='\${sysconfdir}/xdg/menus' diff --git a/file-integration/basketthumbcreator.desktop b/file-integration/basketthumbcreator.desktop index 612e6cb..0db2907 100644 --- a/file-integration/basketthumbcreator.desktop +++ b/file-integration/basketthumbcreator.desktop @@ -15,4 +15,4 @@ Name[tr]=Basket Arşivleri & Şablonları ServiceTypes=ThumbCreator MimeTypes=application/x-basket-archive,application/x-basket-template CacheThumbnail=true -X-KDE-Library=basketthumbcreator +X-TDE-Library=basketthumbcreator diff --git a/kontact_plugin/basket.desktop b/kontact_plugin/basket.desktop index 67cb657..333bd2b 100644 --- a/kontact_plugin/basket.desktop +++ b/kontact_plugin/basket.desktop @@ -4,18 +4,18 @@ Type=Service Icon=basket ServiceTypes=Kontact/Plugin,KPluginInfo -X-KDE-Library=libkontact_basket -X-KDE-KontactPluginVersion=5 -X-KDE-KontactPartLibraryName=libbasketpart -X-KDE-KontactPartExecutableName=basket -X-KDE-KontactPartLoadOnStart=true -X-KDE-KontactPluginHasSummary=false +X-TDE-Library=libkontact_basket +X-TDE-KontactPluginVersion=5 +X-TDE-KontactPartLibraryName=libbasketpart +X-TDE-KontactPartExecutableName=basket +X-TDE-KontactPartLoadOnStart=true +X-TDE-KontactPluginHasSummary=false -X-KDE-PluginInfo-Website=http://basket.kde.org/ -X-KDE-PluginInfo-Name=kontact_basketplugin -X-KDE-PluginInfo-Version=1.0.3.1 -X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true +X-TDE-PluginInfo-Website=http://basket.kde.org/ +X-TDE-PluginInfo-Name=kontact_basketplugin +X-TDE-PluginInfo-Version=1.0.3.1 +X-TDE-PluginInfo-License=GPL +X-TDE-PluginInfo-EnabledByDefault=true Comment=BasKet Note Pads plugin for Kontact Comment[de]=Plugin BasKet Notizblätter für Kontact diff --git a/kontact_plugin/basket_v4.desktop b/kontact_plugin/basket_v4.desktop index 84954a5..ebd898f 100644 --- a/kontact_plugin/basket_v4.desktop +++ b/kontact_plugin/basket_v4.desktop @@ -4,18 +4,18 @@ Type=Service Icon=basket ServiceTypes=Kontact/Plugin,KPluginInfo -X-KDE-Library=libkontact_basket -X-KDE-KontactPluginVersion=4 -X-KDE-KontactPartLibraryName=libbasketpart -X-KDE-KontactPartExecutableName=basket -X-KDE-KontactPartLoadOnStart=true -X-KDE-KontactPluginHasSummary=false +X-TDE-Library=libkontact_basket +X-TDE-KontactPluginVersion=4 +X-TDE-KontactPartLibraryName=libbasketpart +X-TDE-KontactPartExecutableName=basket +X-TDE-KontactPartLoadOnStart=true +X-TDE-KontactPluginHasSummary=false -X-KDE-PluginInfo-Website=http://basket.kde.org/ -X-KDE-PluginInfo-Name=kontact_basketplugin -X-KDE-PluginInfo-Version=1.0.3.1 -X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true +X-TDE-PluginInfo-Website=http://basket.kde.org/ +X-TDE-PluginInfo-Name=kontact_basketplugin +X-TDE-PluginInfo-Version=1.0.3.1 +X-TDE-PluginInfo-License=GPL +X-TDE-PluginInfo-EnabledByDefault=true Comment=BasKet Note Pads plugin for Kontact Comment[de]=Plugin BasKet Notizblätter für Kontact diff --git a/src/basket.desktop b/src/basket.desktop index 5fcf3ef..97c9b71 100644 --- a/src/basket.desktop +++ b/src/basket.desktop @@ -31,4 +31,4 @@ Comment[pt]=Cuidando das suas ideias. Comment[ru]=Заботимся о ваших идеях. Comment[xx]=xxTaking care of your ideas.xx Comment[tr]=Not Tutma Aracı -Categories=KDE;Application;Utility;TextEditor; +Categories=TDE;Application;Utility;TextEditor; diff --git a/src/basket_config_apps.desktop b/src/basket_config_apps.desktop index 66b0955..080a30d 100644 --- a/src/basket_config_apps.desktop +++ b/src/basket_config_apps.desktop @@ -4,14 +4,14 @@ Icon=run Type=Service ServiceTypes=KCModule -X-KDE-ModuleType=Library -X-KDE-Library=basket -X-KDE-FactoryName=basket_config_apps -X-KDE-HasReadOnlyMode=false -X-KDE-ParentApp=basket -X-KDE-ParentComponents=basket,kontact_basketplugin -X-KDE-CfgDlgHierarchy=Basket -X-KDE-Weight=30 +X-TDE-ModuleType=Library +X-TDE-Library=basket +X-TDE-FactoryName=basket_config_apps +X-TDE-HasReadOnlyMode=false +X-TDE-ParentApp=basket +X-TDE-ParentComponents=basket,kontact_basketplugin +X-TDE-CfgDlgHierarchy=Basket +X-TDE-Weight=30 Name=Applications Name[de]=Anwendungen diff --git a/src/basket_config_baskets.desktop b/src/basket_config_baskets.desktop index 11f2242..8f01c5f 100644 --- a/src/basket_config_baskets.desktop +++ b/src/basket_config_baskets.desktop @@ -4,14 +4,14 @@ Icon=basket Type=Service ServiceTypes=KCModule -X-KDE-ModuleType=Library -X-KDE-Library=basket -X-KDE-FactoryName=basket_config_baskets -X-KDE-HasReadOnlyMode=false -X-KDE-ParentApp=basket -X-KDE-ParentComponents=basket,kontact_basketplugin -X-KDE-CfgDlgHierarchy=Basket -X-KDE-Weight=10 +X-TDE-ModuleType=Library +X-TDE-Library=basket +X-TDE-FactoryName=basket_config_baskets +X-TDE-HasReadOnlyMode=false +X-TDE-ParentApp=basket +X-TDE-ParentComponents=basket,kontact_basketplugin +X-TDE-CfgDlgHierarchy=Basket +X-TDE-Weight=10 Name=Baskets Name[de]=Körbe diff --git a/src/basket_config_general.desktop b/src/basket_config_general.desktop index 24d8534..74ce1f2 100644 --- a/src/basket_config_general.desktop +++ b/src/basket_config_general.desktop @@ -4,14 +4,14 @@ Icon=configure Type=Service ServiceTypes=KCModule -X-KDE-ModuleType=Library -X-KDE-Library=basket -X-KDE-FactoryName=basket_config_general -X-KDE-HasReadOnlyMode=false -X-KDE-ParentApp=basket -X-KDE-ParentComponents=basket,kontact_basketplugin -X-KDE-CfgDlgHierarchy=Basket -X-KDE-Weight=10 +X-TDE-ModuleType=Library +X-TDE-Library=basket +X-TDE-FactoryName=basket_config_general +X-TDE-HasReadOnlyMode=false +X-TDE-ParentApp=basket +X-TDE-ParentComponents=basket,kontact_basketplugin +X-TDE-CfgDlgHierarchy=Basket +X-TDE-Weight=10 Name=General Name[de]=Allgemein diff --git a/src/basket_config_new_notes.desktop b/src/basket_config_new_notes.desktop index 87474e9..ca57ac7 100644 --- a/src/basket_config_new_notes.desktop +++ b/src/basket_config_new_notes.desktop @@ -4,14 +4,14 @@ Icon=filenew Type=Service ServiceTypes=KCModule -X-KDE-ModuleType=Library -X-KDE-Library=basket -X-KDE-FactoryName=basket_config_new_notes -X-KDE-HasReadOnlyMode=false -X-KDE-ParentApp=basket -X-KDE-ParentComponents=basket,kontact_basketplugin -X-KDE-CfgDlgHierarchy=Basket -X-KDE-Weight=10 +X-TDE-ModuleType=Library +X-TDE-Library=basket +X-TDE-FactoryName=basket_config_new_notes +X-TDE-HasReadOnlyMode=false +X-TDE-ParentApp=basket +X-TDE-ParentComponents=basket,kontact_basketplugin +X-TDE-CfgDlgHierarchy=Basket +X-TDE-Weight=10 Name=New Notes Name[de]=Neue Notizen diff --git a/src/basket_config_notes_appearance.desktop b/src/basket_config_notes_appearance.desktop index 676cac4..225402f 100644 --- a/src/basket_config_notes_appearance.desktop +++ b/src/basket_config_notes_appearance.desktop @@ -4,14 +4,14 @@ Icon=colorize Type=Service ServiceTypes=KCModule -X-KDE-ModuleType=Library -X-KDE-Library=basket -X-KDE-FactoryName=basket_config_notes_appearance -X-KDE-HasReadOnlyMode=false -X-KDE-ParentApp=basket -X-KDE-ParentComponents=basket,kontact_basketplugin -X-KDE-CfgDlgHierarchy=Basket -X-KDE-Weight=10 +X-TDE-ModuleType=Library +X-TDE-Library=basket +X-TDE-FactoryName=basket_config_notes_appearance +X-TDE-HasReadOnlyMode=false +X-TDE-ParentApp=basket +X-TDE-ParentComponents=basket,kontact_basketplugin +X-TDE-CfgDlgHierarchy=Basket +X-TDE-Weight=10 Name=Notes Appearance Name[de]=Erscheinungsbild diff --git a/src/basket_part.desktop b/src/basket_part.desktop index 789474d..ed6d3b3 100644 --- a/src/basket_part.desktop +++ b/src/basket_part.desktop @@ -17,5 +17,5 @@ Name[tr]=basket Bileşeni Name[ru]=Модуль basket MimeType=application/x-basket; ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart -X-KDE-Library=libbasketpart +X-TDE-Library=libbasketpart Type=Service diff --git a/src/softwareimporters.cpp b/src/softwareimporters.cpp index 520aec4..fd8e088 100644 --- a/src/softwareimporters.cpp +++ b/src/softwareimporters.cpp @@ -345,7 +345,7 @@ void SoftwareImporters::importKNotes() inDescription = true; } else if (inDescription && buf.startsWith(" ")) { body += buf.mid(1, buf.length()); - } else if (buf.startsWith("X-KDE-KNotes-RichText:")) { + } else if (buf.startsWith("X-TDE-KNotes-RichText:")) { isRichText = XMLWork::trueOrFalse(buf.mid(22, buf.length() - 22).stripWhiteSpace(), "false"); } else if (buf == "END:VJOURNAL") { insertTitledNote(basket, fromICS(title), fromICS(body), (isRichText ? TQt::RichText : TQt::PlainText));