summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-06-08 17:01:01 -0500
committerDarrell Anderson <[email protected]>2012-06-08 17:01:01 -0500
commite744ad568867fcb573b9b369d5daf4752fc7889c (patch)
treeae9252d2f7b74afd6f4afb031f0699fa10a31af4
parent7bfb85e3b4ce92df16bbd76d86972629673a0dea (diff)
downloadkrusader-e744ad568867fcb573b9b369d5daf4752fc7889c.tar.gz
krusader-e744ad568867fcb573b9b369d5daf4752fc7889c.zip
Update XDG information in support of bug report 892.
-rw-r--r--acinclude.m42
m---------admin0
m---------cmake0
-rw-r--r--krusader.spec2
-rw-r--r--krusader/KViewer/panelviewer.cpp8
-rw-r--r--krusader/krusader.desktop2
-rw-r--r--krusader/krusader_root-mode.desktop6
7 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 9dc5cee..fed81ce 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/admin b/admin
-Subproject 06098efaf31973c11d7dd89ae291e6844b132e1
+Subproject 4af57bf22967e6ad80ab898980ed505df6eae5b
diff --git a/cmake b/cmake
-Subproject e47cc63e66a12ca6b740500b76f385336ee40db
+Subproject d2f658ca47faefe569bcd1885b9238691fa1328
diff --git a/krusader.spec b/krusader.spec
index dc80983..c0ec9ac 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -87,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README TODO
%{_bindir}/krusader
%{_libdir}/trinity/kio_*.*
-%{_datadir}/applications/kde/*krusader*.desktop
+%{_datadir}/applications/tde/*krusader*.desktop
%{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
%{_datadir}/apps/krusader/
%{_datadir}/config/kio_isorc
diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp
index 6f16dd5..ffeee8f 100644
--- a/krusader/KViewer/panelviewer.cpp
+++ b/krusader/KViewer/panelviewer.cpp
@@ -106,12 +106,12 @@ KParts::ReadOnlyPart* PanelViewer::getPart( TQString mimetype ) {
KService::Ptr ptr = KServiceTypeProfile::preferredService( mimetype, "KParts/ReadOnlyPart" );
if ( ptr ) {
TQStringList args;
- TQVariant argsProp = ptr->property( "X-KDE-BrowserView-Args" );
+ TQVariant argsProp = ptr->property( "X-TDE-BrowserView-Args" );
if ( argsProp.isValid() ) {
TQString argStr = argsProp.toString();
args = TQStringList::split( " ", argStr );
}
- TQVariant prop = ptr->property( "X-KDE-BrowserView-AllowAsDefault" );
+ TQVariant prop = ptr->property( "X-TDE-BrowserView-AllowAsDefault" );
if ( !prop.isValid() || prop.toBool() ) // defaults to true
{
factory = KLibLoader::self() ->factory( ptr->library().latin1() );
@@ -269,12 +269,12 @@ KParts::ReadWritePart* PanelEditor::getPart( TQString mimetype ) {
KService::Ptr ptr = KServiceTypeProfile::preferredService( mimetype, "KParts/ReadWritePart" );
if ( ptr ) {
TQStringList args;
- TQVariant argsProp = ptr->property( "X-KDE-BrowserView-Args" );
+ TQVariant argsProp = ptr->property( "X-TDE-BrowserView-Args" );
if ( argsProp.isValid() ) {
TQString argStr = argsProp.toString();
args = TQStringList::split( " ", argStr );
}
- TQVariant prop = ptr->property( "X-KDE-BrowserView-AllowAsDefault" );
+ TQVariant prop = ptr->property( "X-TDE-BrowserView-AllowAsDefault" );
if ( !prop.isValid() || prop.toBool() ) // defaults to true
{
factory = KLibLoader::self() ->factory( ptr->library().latin1() );
diff --git a/krusader/krusader.desktop b/krusader/krusader.desktop
index 5223b79..c8c0be0 100644
--- a/krusader/krusader.desktop
+++ b/krusader/krusader.desktop
@@ -6,7 +6,7 @@ Icon=krusader_user.png
Terminal=false
Type=Application
DocPath=krusader/index.html
-Categories=FileManager;Utility;Qt;KDE;
+Categories=FileManager;Utility;Qt;TDE;
Comment=Twin-Panel File Manager
Comment[hu]=Kétpaneles fájlkezelő
Comment[de]=Zwei-Fenster Dateimanager
diff --git a/krusader/krusader_root-mode.desktop b/krusader/krusader_root-mode.desktop
index 5d81b4d..e580a08 100644
--- a/krusader/krusader_root-mode.desktop
+++ b/krusader/krusader_root-mode.desktop
@@ -8,10 +8,10 @@ Icon=krusader_root.png
Terminal=false
Type=Application
DocPath=krusader/index.html
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
OnlyShowIn=TDE;
-X-KDE-SubstituteUID=true
-X-KDE-Username=root
+X-TDE-SubstituteUID=true
+X-TDE-Username=root
Comment=Twin-Panel File Manager with root-privileges
Comment[de]=Zwei-Fenster Dateimanager (Systemverwaltungsmodus)
Comment[cs]=Dvojpanelový správce souborů s právy Roota