15 files changed, 22 insertions, 22 deletions
diff --git a/admin b/admin
-Subproject 06098efaf31973c11d7dd89ae291e6844b132e1
+Subproject 4af57bf22967e6ad80ab898980ed505df6eae5b
diff --git a/cmake b/cmake
-Subproject e47cc63e66a12ca6b740500b76f385336ee40db
+Subproject d2f658ca47faefe569bcd1885b9238691fa1328
diff --git a/packaging/FC4.kpowersave.spec b/packaging/FC4.kpowersave.spec
index 92f13d0..d775d23 100644
--- a/packaging/FC4.kpowersave.spec
+++ b/packaging/FC4.kpowersave.spec
@@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/autostart/kpowersave-autostart.desktop
 /usr/share/apps/kpowersave
 /usr/share/icons/??color
-/usr/share/applications/kde/kpowersave.desktop
+/usr/share/applications/tde/kpowersave.desktop
 /usr/share/doc/tde/HTML/*/kpowersave
 /usr/lib*/trinity/kpowersave.*
 /usr/lib*/libtdeinit_kpowersave.*
diff --git a/packaging/FC5.kpowersave.spec b/packaging/FC5.kpowersave.spec
index a96cca8..38e97b1 100644
--- a/packaging/FC5.kpowersave.spec
+++ b/packaging/FC5.kpowersave.spec
@@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/autostart/kpowersave-autostart.desktop
 /usr/share/apps/kpowersave
 /usr/share/icons/??color
-/usr/share/applications/kde/kpowersave.desktop
+/usr/share/applications/tde/kpowersave.desktop
 /usr/share/doc/tde/HTML/*/kpowersave
 /usr/lib*/trinity/kpowersave.*
 /usr/lib*/libtdeinit_kpowersave.*
diff --git a/packaging/FC6.kpowersave.spec b/packaging/FC6.kpowersave.spec
index 602d17d..2ceb9d2 100644
--- a/packaging/FC6.kpowersave.spec
+++ b/packaging/FC6.kpowersave.spec
@@ -59,9 +59,9 @@ make %{?_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT install 
 
 desktop-file-install \
---dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+--dir $RPM_BUILD_ROOT%{_datadir}/applications/tde \
 --vendor="" \
-$RPM_BUILD_ROOT%{_datadir}/applications/kde/kpowersave.desktop
+$RPM_BUILD_ROOT%{_datadir}/applications/tde/kpowersave.desktop
 
 ## File lists
 # locale's
@@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/kpowersave
 %{_libdir}/trinity/kpowersave.*
 %{_libdir}/libtdeinit_kpowersave.*
-%{_datadir}/applications/kde/*kpowersave.desktop
+%{_datadir}/applications/tde/*kpowersave.desktop
 %{_datadir}/apps/kpowersave/
 %{_datadir}/autostart/kpowersave-autostart.desktop
 %{_datadir}/config/kpowersaverc
diff --git a/packaging/SUSE10.0.kpowersave.spec b/packaging/SUSE10.0.kpowersave.spec
index 1f288d1..5753d52 100644
--- a/packaging/SUSE10.0.kpowersave.spec
+++ b/packaging/SUSE10.0.kpowersave.spec
@@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 /opt/trinity/share/autostart/kpowersave-autostart.desktop
 /opt/trinity/share/apps/kpowersave
 /opt/trinity/share/icons/??color
-/opt/trinity/share/applications/kde/kpowersave.desktop
+/opt/trinity/share/applications/tde/kpowersave.desktop
 /opt/trinity/lib*/trinity/kpowersave.*
 /opt/trinity/lib*/libtdeinit_kpowersave.*
 
diff --git a/packaging/SUSE10.1.kpowersave.spec b/packaging/SUSE10.1.kpowersave.spec
index 12c2c6a..56dbb57 100644
--- a/packaging/SUSE10.1.kpowersave.spec
+++ b/packaging/SUSE10.1.kpowersave.spec
@@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 /opt/trinity/share/autostart/kpowersave-autostart.desktop
 /opt/trinity/share/apps/kpowersave
 /opt/trinity/share/icons/??color
-/opt/trinity/share/applications/kde/kpowersave.desktop
+/opt/trinity/share/applications/tde/kpowersave.desktop
 /opt/trinity/lib*/trinity/kpowersave.*
 /opt/trinity/lib*/libtdeinit_kpowersave.*
 
diff --git a/packaging/SUSE9.2.kpowersave.spec b/packaging/SUSE9.2.kpowersave.spec
index 86cc200..900698e 100644
--- a/packaging/SUSE9.2.kpowersave.spec
+++ b/packaging/SUSE9.2.kpowersave.spec
@@ -71,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 /opt/trinity/share/autostart/kpowersave.desktop
 /opt/trinity/share/apps/kpowersave
 /opt/trinity/share/icons/??color
-/opt/trinity/share/applications/kde/kpowersave.desktop
+/opt/trinity/share/applications/tde/kpowersave.desktop
 /opt/trinity/lib*/trinity/kpowersave.*
 /opt/trinity/lib*/libtdeinit_kpowersave.*
 
diff --git a/packaging/SUSE9.3.kpowersave.spec b/packaging/SUSE9.3.kpowersave.spec
index 6bdbafe..da1f5bd 100644
--- a/packaging/SUSE9.3.kpowersave.spec
+++ b/packaging/SUSE9.3.kpowersave.spec
@@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 /opt/trinity/share/autostart/kpowersave.desktop
 /opt/trinity/share/apps/kpowersave
 /opt/trinity/share/icons/??color
-/opt/trinity/share/applications/kde/kpowersave.desktop
+/opt/trinity/share/applications/tde/kpowersave.desktop
 /opt/trinity/lib*/trinity/kpowersave.*
 /opt/trinity/lib*/libtdeinit_kpowersave.*
 
diff --git a/packaging/mandriva.2006.1.kpowersave.spec b/packaging/mandriva.2006.1.kpowersave.spec
index 24440cc..5dd471f 100644
--- a/packaging/mandriva.2006.1.kpowersave.spec
+++ b/packaging/mandriva.2006.1.kpowersave.spec
@@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/autostart/kpowersave-autostart.desktop
 /usr/share/apps/kpowersave
 /usr/share/icons/??color
-/usr/share/applications/kde/kpowersave.desktop
+/usr/share/applications/tde/kpowersave.desktop
 /usr/share/doc/tde/HTML/*/kpowersave
 /usr/lib*/trinity/kpowersave.*
 /usr/lib*/libtdeinit_kpowersave.*
diff --git a/packaging/mandriva.2007.1.kpowersave.spec b/packaging/mandriva.2007.1.kpowersave.spec
index 84ae63c..a756d62 100644
--- a/packaging/mandriva.2007.1.kpowersave.spec
+++ b/packaging/mandriva.2007.1.kpowersave.spec
@@ -56,7 +56,7 @@ rm -rf %{buildroot}
 %find_lang %{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_menudir}
-kdedesktop2mdkmenu.pl %{name} "System/Monitoring" $RPM_BUILD_ROOT%{_datadir}/applications/kde/kpowersave.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
+kdedesktop2mdkmenu.pl %{name} "System/Monitoring" $RPM_BUILD_ROOT%{_datadir}/applications/tde/kpowersave.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
 install -D -m 644 %{buildroot}%{_iconsdir}/hicolor/32x32/apps/%{name}.png %{buildroot}%{_iconsdir}/%{name}.png
 install -D -m 644 %{buildroot}%{_iconsdir}/hicolor/48x48/apps/%{name}.png %{buildroot}%{_liconsdir}/%{name}.png
 install -D -m 644 %{buildroot}%{_iconsdir}/hicolor/16x16/apps/%{name}.png %{buildroot}%{_miconsdir}/%{name}.png
@@ -85,7 +85,7 @@ rm -rf %{buildroot}
 %{_datadir}/apps/%{name}
 %{_iconsdir}/hicolor/*/apps/*.png
 %{_datadir}/icons/*.png
-%{_datadir}/applications/kde/kpowersave.desktop
+%{_datadir}/applications/tde/kpowersave.desktop
 %doc %{_docdir}/HTML/*/kpowersave
 %{_libdir}/trinity/*
 %{_libdir}/*.so
diff --git a/packaging/openSUSE10.2.kpowersave.spec b/packaging/openSUSE10.2.kpowersave.spec
index fa5f134..e680140 100644
--- a/packaging/openSUSE10.2.kpowersave.spec
+++ b/packaging/openSUSE10.2.kpowersave.spec
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 /opt/trinity/share/autostart/kpowersave-autostart.desktop
 /opt/trinity/share/apps/kpowersave
 /opt/trinity/share/icons/??color
-/opt/trinity/share/applications/kde/kpowersave.desktop
+/opt/trinity/share/applications/tde/kpowersave.desktop
 /opt/trinity/lib*/trinity/kpowersave.*
 /opt/trinity/lib*/libtdeinit_kpowersave.*
 
diff --git a/packaging/openSUSE10.3.kpowersave.spec b/packaging/openSUSE10.3.kpowersave.spec
index ea4ece6..d1e3c0a 100644
--- a/packaging/openSUSE10.3.kpowersave.spec
+++ b/packaging/openSUSE10.3.kpowersave.spec
@@ -94,7 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 /opt/trinity/share/autostart/kpowersave-autostart.desktop
 /opt/trinity/share/apps/kpowersave
 /opt/trinity/share/icons/??color
-/opt/trinity/share/applications/kde/kpowersave.desktop
+/opt/trinity/share/applications/tde/kpowersave.desktop
 /opt/trinity/lib*/trinity/kpowersave.*
 /opt/trinity/lib*/libtdeinit_kpowersave.*
 
diff --git a/src/kpowersave-autostart.desktop b/src/kpowersave-autostart.desktop
index 3409cbc..96bc19f 100644
--- a/src/kpowersave-autostart.desktop
+++ b/src/kpowersave-autostart.desktop
@@ -60,9 +60,9 @@ GenericName[zh_CN]=电池监视器
 Comment[zh_CN]=电池监视器和常规电源管理
 GenericName[zh_TW]=電池監視器
 Comment[zh_TW]=電池監視器和一般電源管理
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-KDE-UniqueApplet=true
-X-KDE-autostart-condition=kpowersaverc:General:Autostart:true
+X-TDE-autostart-after=panel
+X-TDE-StartupNotify=false
+X-TDE-UniqueApplet=true
+X-TDE-autostart-condition=kpowersaverc:General:Autostart:true
 Categories=System;Applet;
 
diff --git a/src/kpowersave.desktop b/src/kpowersave.desktop
index 914b172..08021ab 100644
--- a/src/kpowersave.desktop
+++ b/src/kpowersave.desktop
@@ -60,9 +60,9 @@ GenericName[zh_CN]=电池监视器
 Comment[zh_CN]=电池监视器和常规电源管理
 GenericName[zh_TW]=電池監視器
 Comment[zh_TW]=電池監視器和一般電源管理
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-KDE-UniqueApplet=true
-X-KDE-autostart-condition=kpowersaverc:General:Autostart:true
+X-TDE-autostart-after=panel
+X-TDE-StartupNotify=false
+X-TDE-UniqueApplet=true
+X-TDE-autostart-condition=kpowersaverc:General:Autostart:true
 Categories=System;Applet;