Mailinglist Archive: opensuse-commit (858 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdeutils4
checked in at Wed Nov 21 18:29:15 CET 2007.

--------
--- KDE/kdeutils4/kdeutils4.changes     2007-11-01 12:21:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes    2007-11-14 
17:37:41.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Nov 14 17:37:41 CET 2007 - dmueller@xxxxxxx
+
+- update to 3.96.0
+
+-------------------------------------------------------------------
+Wed Nov  7 10:42:47 CET 2007 - dmueller@xxxxxxx
+
+- update to 3.95.2
+
+-------------------------------------------------------------------

Old:
----
  kdeutils-3.95.1.tar.bz2
  r731538.diff

New:
----
  kdeutils-3.96.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.u32354/_old  2007-11-21 18:28:58.000000000 +0100
+++ /var/tmp/diff_new_pack.u32354/_new  2007-11-21 18:28:58.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package kdeutils4 (Version 3.95.1)
+# spec file for package kdeutils4 (Version 3.96.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -21,15 +21,14 @@
 Group:          Productivity/Other
 Summary:        Base Package of KDE Utility Programs
 Url:            http://www.kde.org
-Version:        3.95.1
+Version:        3.96.0
 Release:        1
-%define rversion 3.95.1
+%define rversion 3.96.0
 Source0:        kdeutils-%rversion.tar.bz2
 Source1:        _upstream
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       kdebase4-runtime
 Patch:          desktop-files.diff
-Patch1:         r731538.diff
 Suggests:       kde4-ark
 Suggests:       kde4-kcalc
 Suggests:       kde4-kcharselect
@@ -60,7 +59,6 @@
 %prep
 %setup -q -n kdeutils-%rversion
 %patch
-%patch1
 
 %build
   %cmake_kde4 -d build
@@ -69,6 +67,23 @@
 %install
   cd build
   %makeinstall
+  %create_subdir_filelist -d ark -n kdeutils-%rversion
+  %create_subdir_filelist -d kcalc -n kdeutils-%rversion
+  %create_subdir_filelist -d kcharselect -n kdeutils-%rversion
+  %create_subdir_filelist -d kdessh -n kdeutils-%rversion
+  %create_subdir_filelist -d kdf -n kdeutils-%rversion
+  %create_subdir_filelist -d kfloppy -n kdeutils-%rversion
+  %create_subdir_filelist -d kgpg -n kdeutils-%rversion
+  %create_subdir_filelist -d khexedit -n kdeutils-%rversion
+  %create_subdir_filelist -d kjots -n kdeutils-%rversion
+  %create_subdir_filelist -d kmilo -n kdeutils-%rversion
+  %create_subdir_filelist -d kregexpeditor -n kdeutils-%rversion
+  %create_subdir_filelist -d ktimer -n kdeutils-%rversion
+  %create_subdir_filelist -d kwallet -n kdeutils-%rversion
+  %create_subdir_filelist -d superkaramba -n kdeutils-%rversion
+  %create_subdir_filelist -d sweeper -n kdeutils-%rversion
+  cd ..
+  cat filelists/* | while read line; do echo "%exclude $line";done 
> filelists/exclude
   %suse_update_desktop_file superkaramba Utility DesktopUtility
   %suse_update_desktop_file KCharSelect Utility Accessibility
   %suse_update_desktop_file khexedit    Utility Editor
@@ -93,6 +108,7 @@
 
 %clean
   rm -rf $RPM_BUILD_ROOT
+  rm -rf filelists
 
 %package -n kde4-ark
 Group:          Productivity/Archiving/Compression
@@ -114,21 +130,9 @@
 %postun -n kde4-ark
 %run_ldconfig
 
-%files -n kde4-ark
+%files -n kde4-ark -f filelists/ark
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/ark
-%_kde_libdir/kde4/libarkpart.so
-%_kde_share_dir/apps/ark
-%_kde_share_dir/config.kcfg/ark.kcfg
-%_kde_share_dir/services/ark_part.desktop
-/usr/bin/ark
-/usr/share/applications/kde4/ark.desktop
-/usr/%_lib/kde4/kerfuffle_bk.so
-/usr/%_lib/libkerfuffle.so
-/usr/%_lib/libkerfuffle.so.*
-/usr/share/kde4/services/kerfuffle_bk.desktop
-/usr/share/kde4/servicetypes/kerfufflePlugin.desktop
 
 %package -n kde4-kcalc
 Group:          Productivity/Scientific/Math
@@ -150,17 +154,9 @@
 %postun -n kde4-kcalc
 %run_ldconfig
 
-%files -n kde4-kcalc
+%files -n kde4-kcalc -f filelists/kcalc
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kcalc
-%_kde_libdir/libkdeinit4_kcalc.so
-%_kde_share_dir/apps/kcalc
-%_kde_share_dir/apps/kconf_update/kcalcrc.upd
-%_kde_share_dir/config.kcfg/kcalc.kcfg
-/usr/bin/kcalc
-/usr/share/applications/kde4/kcalc.desktop
-/usr/share/icons/hicolor/*/apps/kcalc.*
 
 %package -n kde4-kcharselect
 Group:          Productivity/Other
@@ -182,15 +178,9 @@
 %postun -n kde4-kcharselect
 %run_ldconfig
 
-%files -n kde4-kcharselect
+%files -n kde4-kcharselect -f filelists/kcharselect
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-/usr/bin/kcharselect
-/usr/share/applications/kde4/KCharSelect.desktop
-%_kde_share_dir/apps/kcharselect
-%_kde_share_dir/apps/kconf_update/kcharselect.upd
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kcharselect
-/usr/share/icons/hicolor/*/apps/kcharselect.*
 
 %package -n kde4-kdessh
 Group:          System/GUI/KDE
@@ -212,10 +202,9 @@
 %postun -n kde4-kdessh
 %run_ldconfig
 
-%files -n kde4-kdessh
+%files -n kde4-kdessh -f filelists/kdessh
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-/usr/bin/kdessh
 
 %package -n kde4-kdf
 Group:          System/Monitoring
@@ -237,17 +226,12 @@
 %postun -n kde4-kdf
 %run_ldconfig
 
-%files -n kde4-kdf
+%files -n kde4-kdf -f filelists/kdf
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-/usr/bin/kdf
-%_kde_libdir/kde4/kcm_kdf.so
-/usr/share/applications/kde4/kdf.desktop
-%_kde_share_dir/apps/kdf
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kdf
-/usr/share/icons/hicolor/*/apps/kdf.*
-/usr/share/icons/oxygen/*/apps/kcmdf.*
-%_kde_share_dir/services/kcmdf.desktop
+%exclude /usr/bin/kwikdisk
+%exclude /usr/share/applications/kde4/kwikdisk.desktop
+%exclude /usr/share/icons/hicolor/*/apps/kwikdisk.*
 
 %package -n kde4-kfloppy
 Group:          System/GUI/KDE
@@ -269,16 +253,9 @@
 %postun -n kde4-kfloppy
 %run_ldconfig
 
-%files -n kde4-kfloppy
+%files -n kde4-kfloppy -f filelists/kfloppy
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-/usr/bin/kfloppy
-/usr/share/applications/kde4/KFloppy.desktop
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kfloppy
-/usr/share/icons/hicolor/*/apps/kfloppy.*
-%dir %_kde_share_dir/apps/konqueror
-%dir %_kde_share_dir/apps/konqueror/servicemenus
-%_kde_share_dir/apps/konqueror/servicemenus/floppy_format.desktop
 
 %package -n kde4-kgpg
 Group:          Productivity/Security
@@ -300,21 +277,9 @@
 %postun -n kde4-kgpg
 %run_ldconfig
 
-%files -n kde4-kgpg
+%files -n kde4-kgpg -f filelists/kgpg
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kgpg
-%dir %_kde_share_dir/apps/konqueror
-%dir %_kde_share_dir/apps/konqueror/servicemenus
-%_kde_share_dir/apps/kgpg
-%_kde_share_dir/apps/konqueror/servicemenus/encryptfile.desktop
-%_kde_share_dir/apps/konqueror/servicemenus/encryptfolder.desktop
-%_kde_share_dir/config.kcfg/kgpg.kcfg
-/usr/bin/kgpg
-/usr/share/applications/kde4/kgpg.desktop
-/usr/share/autostart/kgpg.desktop
-/usr/share/dbus-1/interfaces/org.kde.kgpg.Key.xml
-/usr/share/icons/hicolor/*/apps/kgpg.*
 
 %package -n kde4-khexeditor
 Group:          Development/Tools/Other
@@ -336,23 +301,10 @@
 %postun -n kde4-khexeditor
 %run_ldconfig
 
-%files -n kde4-khexeditor
+%files -n kde4-khexeditor -f filelists/khexedit
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/khexedit
-%_kde_libdir/kde4/libkbytearrayedit.so
-%_kde_libdir/kde4/liboktetapart.so
-%_kde_libdir/liboktetacore.so
-%_kde_libdir/liboktetacore.so.*
-%_kde_libdir/liboktetagui.so
-%_kde_libdir/liboktetagui.so.*
-%_kde_share_dir/apps/khexedit
-%_kde_share_dir/apps/oktetapart
-%_kde_share_dir/services/kbytearrayedit.desktop
-%_kde_share_dir/services/oktetapart.desktop
-/usr/bin/khexedit
-/usr/share/applications/kde4/khexedit.desktop
-/usr/share/icons/hicolor/*/apps/khexedit.*
+%dir /usr/share/kde4/apps/oktetapart
 
 %package -n kde4-kjots
 Group:          Productivity/Other
@@ -374,15 +326,9 @@
 %postun -n kde4-kjots
 %run_ldconfig
 
-%files -n kde4-kjots
+%files -n kde4-kjots -f filelists/kjots
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kjots
-%_kde_share_dir/apps/kjots
-%_kde_share_dir/config.kcfg/kjots.kcfg
-/usr/bin/kjots
-/usr/share/applications/kde4/Kjots.desktop
-/usr/share/icons/hicolor/*/apps/kjots.*
 
 %package -n kde4-kregexpeditor
 Group:          Productivity/Other
@@ -404,21 +350,10 @@
 %postun -n kde4-kregexpeditor
 %run_ldconfig
 
-%files -n kde4-kregexpeditor
+%files -n kde4-kregexpeditor -f filelists/kregexpeditor
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
 %doc %lang(en) /usr/share/doc/kde/HTML/en/KRegExpEditor
-%_kde_libdir/kde4/libkregexpeditorgui.so
-%_kde_libdir/libkregexpeditorcommon.*
-%_kde_share_dir/apps/kregexpeditor
-%_kde_share_dir/services/kregexpeditorgui.desktop
-/usr/bin/kregexpeditor
-/usr/include/kmultiformlistboxentry.h
-/usr/include/kmultiformlistboxfactory.h
-/usr/include/kmultiformlistbox.h
-/usr/include/kwidgetstreamer.h
-/usr/share/applications/kde4/kregexpeditor.desktop
-/usr/share/icons/hicolor/*/apps/kregexpeditor.*
 
 %package -n kde4-ktimer
 Group:          Productivity/Other
@@ -440,13 +375,9 @@
 %postun -n kde4-ktimer
 %run_ldconfig
 
-%files -n kde4-ktimer
+%files -n kde4-ktimer -f filelists/ktimer
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/ktimer
-/usr/bin/ktimer
-/usr/share/applications/kde4/ktimer.desktop
-/usr/share/icons/hicolor/*/apps/ktimer.*
 
 %package -n kde4-kwalletmanager
 Group:          System/GUI/KDE
@@ -468,19 +399,10 @@
 %postun -n kde4-kwalletmanager
 %run_ldconfig
 
-%files -n kde4-kwalletmanager
+%files -n kde4-kwalletmanager -f filelists/kwallet
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kwallet
-%_kde_libdir/kde4/kcm_kwallet.so
-%_kde_share_dir/apps/kwalletmanager
-%_kde_share_dir/services/kwalletconfig.desktop
-%_kde_share_dir/services/kwalletmanager_show.desktop
-/usr/bin/kwalletmanager
-/usr/share/applications/kde4/kwalletmanager.desktop
-/usr/share/applications/kde4/kwalletmanager-kwalletd.desktop
-/usr/share/icons/hicolor/*/apps/kwalletmanager.*
-/usr/share/icons/hicolor/*/apps/kwalletmanager2.*
+/usr/share/kde4/apps/kwalletmanager
 
 %package -n kde4-kwikdisk
 Group:          System/GUI/KDE
@@ -527,13 +449,9 @@
 
 %postun -n kde4-sweeper -p /sbin/ldconfig
 
-%files -n kde4-sweeper
+%files -n kde4-sweeper -f filelists/sweeper
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%_kde_share_dir/apps/sweeper
-/usr/bin/sweeper
-/usr/share/applications/kde4/sweeper.desktop
-/usr/share/dbus-1/interfaces/org.kde.sweeper.xml
 
 %package -n kde4-kmilo
 Group:          System/GUI/KDE
@@ -556,23 +474,11 @@
 %postun -n kde4-kmilo
 %run_ldconfig
 
-%files -n kde4-kmilo
+%files -n kde4-kmilo -f filelists/kmilo
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
-%_kde_libdir/kde4/kcm_thinkpad.so
-%_kde_libdir/kde4/kcm_kvaio.so
-%_kde_libdir/kde4/kded_kmilod.so
-%_kde_libdir/kde4/kmilo_asus.so
-%_kde_libdir/kde4/kmilo_kvaio.so
-%_kde_libdir/kde4/kmilo_thinkpad.so
-%_kde_libdir/kde4/kmilo_delli8k.so
-%_kde_libdir/libkmilo.*
-%_kde_share_dir/services/kded/kmilod.desktop
-%_kde_share_dir/services/kmilo
-%_kde_share_dir/services/thinkpad.desktop
-%_kde_share_dir/services/kvaio.desktop
-%_kde_share_dir/servicetypes/kmilo
-/usr/share/dbus-1/interfaces/org.kde.kmilod.xml
+%dir /usr/share/kde4/services/kmilo
+%dir /usr/share/kde4/servicetypes/kmilo
 
 %package -n kde4-superkaramba
 Group:          System/GUI/KDE
@@ -595,26 +501,18 @@
 %postun -n kde4-superkaramba
 %run_ldconfig
 
-%files -n kde4-superkaramba
+%files -n kde4-superkaramba -f filelists/superkaramba
 %defattr(-,root,root)
 %config %_kde_config_dir/superkaramba.knsrc
-%doc AUTHORS COPYING COPYING-DOCS README
-%doc %lang(en) /usr/share/doc/kde/HTML/en/superkaramba
-%_kde_libdir/libsuperkaramba.so
-%_kde_libdir/libsuperkaramba.so.*
-%_kde_share_dir/apps/superkaramba
-/usr/bin/superkaramba
-/usr/%_lib/kde4/plasma_applet_skapplet.so
-/usr/share/kde4/services/plasma-skapplet-default.desktop
-/usr/share/applications/kde4/superkaramba.desktop
-/usr/share/dbus-1/interfaces/org.kde.superkaramba.xml
-/usr/share/icons/hicolor/*/apps/superkaramba.*
-/usr/share/icons/oxygen/*/mimetypes/superkaramba_theme.*
 
-%files
+%files -f filelists/exclude
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING-DOCS README
 %changelog
+* Wed Nov 14 2007 - dmueller@xxxxxxx
+- update to 3.96.0
+* Wed Nov 07 2007 - dmueller@xxxxxxx
+- update to 3.95.2
 * Thu Nov 01 2007 - dmueller@xxxxxxx
 - update to 3.95.1
 * Thu Nov 01 2007 - dmueller@xxxxxxx

++++++ kdeutils-3.95.1.tar.bz2 -> kdeutils-3.96.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ark/app/ark.desktop 
new/kdeutils-3.96.0/ark/app/ark.desktop
--- old/kdeutils-3.95.1/ark/app/ark.desktop     2007-10-31 21:44:51.000000000 
+0100
+++ new/kdeutils-3.96.0/ark/app/ark.desktop     2007-11-06 09:01:40.000000000 
+0100
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip;application/x-java-archive;application/x-deb
+MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip;application/x-java-archive;application/x-deb;
 GenericName=Archiving Tool
 GenericName[af]=Argiveer Program
 GenericName[ar]=أداة أرشفة
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ark/kerfuffle/kerfufflePlugin.desktop 
new/kdeutils-3.96.0/ark/kerfuffle/kerfufflePlugin.desktop
--- old/kdeutils-3.95.1/ark/kerfuffle/kerfufflePlugin.desktop   2007-10-16 
16:49:28.000000000 +0200
+++ new/kdeutils-3.96.0/ark/kerfuffle/kerfufflePlugin.desktop   2007-11-06 
09:01:40.000000000 +0100
@@ -5,7 +5,7 @@
 Comment=Plugin for handling of archive formats for the Kerfuffle library
 Comment[ar]=ملحق للتحكم بهيئات اﻷرشيف لمكتبة Kerfuffle
 Comment[el]=Πρόσθετο χειρισμού μορφών αρχειοθήκης για τη βιβλιοθήκη Kerfuffle
-Comment[es]=Extensión para manejar formatos de archivo de la biblioteca 
Kerfuffle
+Comment[es]=Complemento para manejar formatos de archivo de la biblioteca 
Kerfuffle
 Comment[et]=Kerfuffle'i teegi arhiivifailide haldamise plugin
 Comment[he]=תוסף לניהול פורמטי ארכיונים לספריית Kerfuffle 
 Comment[ja]=Kerfuffle ライブラリのアーカイブ形式を扱うプラグイン
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ark/part/ark_part.desktop 
new/kdeutils-3.96.0/ark/part/ark_part.desktop
--- old/kdeutils-3.95.1/ark/part/ark_part.desktop       2007-10-31 
21:44:51.000000000 +0100
+++ new/kdeutils-3.96.0/ark/part/ark_part.desktop       2007-11-14 
01:26:27.000000000 +0100
@@ -11,6 +11,7 @@
 Name[da]=Arkivbehandler
 Name[de]=Archivprogramm
 Name[el]=Πρόγραμμα αρχειοθέτησης
+Name[eo]=Arkivilo
 Name[es]=Archivador
 Name[et]=Arhiveerija
 Name[eu]=Artxibalaria
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ark/part/infopanel.h 
new/kdeutils-3.96.0/ark/part/infopanel.h
--- old/kdeutils-3.95.1/ark/part/infopanel.h    2007-10-03 13:47:49.000000000 
+0200
+++ new/kdeutils-3.96.0/ark/part/infopanel.h    2007-11-14 01:26:27.000000000 
+0100
@@ -26,7 +26,6 @@
 #include "archivemodel.h"
 #include "ui_infopanel.h"
 
-class QLabel;
 
 class InfoPanel: public QFrame, Ui::InformationPanel
 {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ark/plugins/bk/bkRead.c 
new/kdeutils-3.96.0/ark/plugins/bk/bkRead.c
--- old/kdeutils-3.95.1/ark/plugins/bk/bkRead.c 2007-10-23 10:37:06.000000000 
+0200
+++ new/kdeutils-3.96.0/ark/plugins/bk/bkRead.c 2007-11-06 09:01:40.000000000 
+0100
@@ -945,7 +945,7 @@
     
     rc = read(volInfo->imageForReading, suFields, lenSU);
     if(rc != lenSU) {
-        free (lenSU);
+        free (suFields);
         return BKERROR_READ_GENERIC;
     }
     
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ark/plugins/bk/kerfuffle_bk.desktop 
new/kdeutils-3.96.0/ark/plugins/bk/kerfuffle_bk.desktop
--- old/kdeutils-3.95.1/ark/plugins/bk/kerfuffle_bk.desktop     2007-10-16 
16:49:28.000000000 +0200
+++ new/kdeutils-3.96.0/ark/plugins/bk/kerfuffle_bk.desktop     2007-11-06 
09:01:40.000000000 +0100
@@ -19,7 +19,7 @@
 Comment=bkisofs plugin for Kerfuffle
 Comment[ar]=bkisofs ملحق لـ Kerfuffle
 Comment[el]=πρόσθετο bkisofs για τη Kerfuffle
-Comment[es]=Extensión bkisofs para Kerfuffle
+Comment[es]=Complemento bkisofs para Kerfuffle
 Comment[et]=Kerfuffle'i bkisofs'i plugin
 Comment[he]=תוסף bkisofs עבור Kerfuffle
 Comment[ja]=Kerfuffle のための bkisofs プラグイン
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop 
new/kdeutils-3.96.0/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop
--- old/kdeutils-3.95.1/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop   
2007-10-16 16:49:28.000000000 +0200
+++ new/kdeutils-3.96.0/ark/plugins/karchiveplugin/kerfuffle_karchive.desktop   
2007-11-06 09:01:40.000000000 +0100
@@ -18,7 +18,7 @@
 Comment=KArchive plugin for Kerfuffle
 Comment[ar]=KArchive ملحق لـ Kerfuffle
 Comment[el]=πρόσθετο KArchive για τη Kerfuffle
-Comment[es]=Extensión KArchive para Kerfuffle
+Comment[es]=Complemento KArchive para Kerfuffle
 Comment[et]=Kerfuffle'i KArchive plugin
 Comment[he]=תוסף KArchive  עבור Kerfuffle
 Comment[ja]=Kerfuffle のための KArchive プラグイン
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/ark/plugins/libarchive/kerfuffle_libarchive.desktop 
new/kdeutils-3.96.0/ark/plugins/libarchive/kerfuffle_libarchive.desktop
--- old/kdeutils-3.95.1/ark/plugins/libarchive/kerfuffle_libarchive.desktop     
2007-10-16 16:49:28.000000000 +0200
+++ new/kdeutils-3.96.0/ark/plugins/libarchive/kerfuffle_libarchive.desktop     
2007-11-06 09:01:40.000000000 +0100
@@ -18,7 +18,7 @@
 Comment=LibArchive Plugin for Kerfuffle
 Comment[ar]=LibArchive ملحق لـ Kerfuffle
 Comment[el]=πρόσθετο LibArchive για τη Kerfuffle
-Comment[es]=Extensión LibArchive para Kerfuffle
+Comment[es]=Complemento LibArchive para Kerfuffle
 Comment[et]=Kerfuffle'i LibArchive plugin
 Comment[he]=תוסף LibArchive  עבור Kerfuffle
 Comment[ja]=Kerfuffle のための LibArchive プラグイン
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/ark/plugins/libarchive/libarchivehandler.h 
new/kdeutils-3.96.0/ark/plugins/libarchive/libarchivehandler.h
--- old/kdeutils-3.95.1/ark/plugins/libarchive/libarchivehandler.h      
2007-10-03 13:47:49.000000000 +0200
+++ new/kdeutils-3.96.0/ark/plugins/libarchive/libarchivehandler.h      
2007-11-14 01:26:26.000000000 +0100
@@ -30,11 +30,6 @@
 
 using namespace Kerfuffle;
 
-namespace ThreadWeaver
-{
-       class Job;
-} // namespace ThreadWeaver
-
 class LibArchiveInterface: public ReadOnlyArchiveInterface
 {
        Q_OBJECT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/ark/plugins/libzipplugin/kerfuffle_libzip.desktop 
new/kdeutils-3.96.0/ark/plugins/libzipplugin/kerfuffle_libzip.desktop
--- old/kdeutils-3.95.1/ark/plugins/libzipplugin/kerfuffle_libzip.desktop       
2007-10-16 16:49:28.000000000 +0200
+++ new/kdeutils-3.96.0/ark/plugins/libzipplugin/kerfuffle_libzip.desktop       
2007-11-06 09:01:40.000000000 +0100
@@ -19,7 +19,7 @@
 Comment=libzip plugin for Kerfuffle
 Comment[ar]=libzip ملحق لـ Kerfuffle
 Comment[el]=πρόσθετο libzip για τη Kerfuffle
-Comment[es]=Extensión libzip para Kerfuffle
+Comment[es]=Complemento libzip para Kerfuffle
 Comment[et]=Kerfuffle'i libzip'i plugin
 Comment[he]=תוסף libzip  עבור Kerfuffle
 Comment[ja]=Kerfuffle のための libzip プラグイン
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/charselectapplet/kcharselectapplet.desktop 
new/kdeutils-3.96.0/charselectapplet/kcharselectapplet.desktop
--- old/kdeutils-3.95.1/charselectapplet/kcharselectapplet.desktop      
2007-10-31 21:44:49.000000000 +0100
+++ new/kdeutils-3.96.0/charselectapplet/kcharselectapplet.desktop      
2007-11-14 01:26:10.000000000 +0100
@@ -9,6 +9,7 @@
 Name[da]=Tegnvælger
 Name[de]=Tabelle zur Zeichenauswahl
 Name[el]=Επιλογέας χαρακτήρων
+Name[eo]=Elektilo por signoj
 Name[es]=Selector de caracteres
 Name[et]=Sümbolite valija
 Name[eu]=Karaktere autatzailea
Files old/kdeutils-3.95.1/doc/ark/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/ark/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kcalc/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kcharselect/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kdelirc/irkick/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kdelirc/irkick/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kdelirc/kcmlirc/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kdelirc/kcmlirc/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kdf/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kfloppy/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kgpg/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/khexedit/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/khexedit/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kinfocenter/blockdevices/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kinfocenter/blockdevices/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kjots/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kjots/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/KRegExpEditor/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/KRegExpEditor/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/ksim/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/ksim/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/ktimer/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/kwallet/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-3.95.1/doc/superkaramba/index.cache.bz2 and 
new/kdeutils-3.96.0/doc/superkaramba/index.cache.bz2 differ
Files old/kdeutils-3.95.1/kdelirc/irkick/lo16-app-irkick.png and 
new/kdeutils-3.96.0/kdelirc/irkick/lo16-app-irkick.png differ
Files old/kdeutils-3.95.1/kdelirc/irkick/lo32-app-irkick.png and 
new/kdeutils-3.96.0/kdelirc/irkick/lo32-app-irkick.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kdelirc/kcmlirc/kcmlirc.desktop 
new/kdeutils-3.96.0/kdelirc/kcmlirc/kcmlirc.desktop
--- old/kdeutils-3.95.1/kdelirc/kcmlirc/kcmlirc.desktop 2007-10-31 
21:44:51.000000000 +0100
+++ new/kdeutils-3.96.0/kdelirc/kcmlirc/kcmlirc.desktop 2007-11-14 
01:26:26.000000000 +0100
@@ -66,6 +66,7 @@
 Name[da]=Fjernbetjeninger
 Name[de]=Fernsteuerungen
 Name[el]=Τηλεχειριστήρια
+Name[eo]=Teleregiloj
 Name[es]=Controles remotos
 Name[et]=Kaugjuhtimine
 Name[eu]=Urruneko Aginteak
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kdf/kdf.desktop 
new/kdeutils-3.96.0/kdf/kdf.desktop
--- old/kdeutils-3.95.1/kdf/kdf.desktop 2007-10-23 10:37:05.000000000 +0200
+++ new/kdeutils-3.96.0/kdf/kdf.desktop 2007-11-14 01:26:15.000000000 +0100
@@ -25,7 +25,7 @@
 GenericName[da]=Se diskforbrug
 GenericName[de]=Festplattenbelegung etc. anzeigen
 GenericName[el]=Προβολή χρήσης του δίσκου
-GenericName[eo]=Vidu la diskan uzon
+GenericName[eo]=Vidi la diskspac-uzadon
 GenericName[es]=Muestra el uso del disco
 GenericName[et]=Kettakasutus
 GenericName[eu]=Erakutsi Diskoaren Erabilera
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kfloppy/CMakeLists.txt 
new/kdeutils-3.96.0/kfloppy/CMakeLists.txt
--- old/kdeutils-3.95.1/kfloppy/CMakeLists.txt  2007-10-03 13:47:41.000000000 
+0200
+++ new/kdeutils-3.96.0/kfloppy/CMakeLists.txt  2007-11-14 01:26:10.000000000 
+0100
@@ -18,7 +18,7 @@
 ########### install files ###############
 
 install( FILES KFloppy.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
-install( FILES floppy_format.desktop  DESTINATION 
${DATA_INSTALL_DIR}/konqueror/servicemenus)
+install( FILES floppy_format.desktop  DESTINATION 
${SERVICES_INSTALL_DIR}/ServiceMenus)
 
 kde4_install_icons( ${ICON_INSTALL_DIR}   )
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kfloppy/floppy_format.desktop 
new/kdeutils-3.96.0/kfloppy/floppy_format.desktop
--- old/kdeutils-3.95.1/kfloppy/floppy_format.desktop   2007-10-31 
21:44:49.000000000 +0100
+++ new/kdeutils-3.96.0/kfloppy/floppy_format.desktop   2007-11-14 
01:26:10.000000000 +0100
@@ -9,7 +9,7 @@
 Name[cy]=Fformat
 Name[de]=Formatieren
 Name[el]=Διαμόρφωση
-Name[eo]=Formatu
+Name[eo]=Formati
 Name[es]=Formatear
 Name[et]=Vorminda
 Name[fa]=قالب‌بندی
@@ -48,7 +48,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Actions=Format;
-ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted
+ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted,KonqPopupMenu/Plugin
 Type=Service
 X-KDE-Priority=TopLevel
 X-KDE-MediaNotifierHide=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/CMakeLists.txt 
new/kdeutils-3.96.0/kgpg/CMakeLists.txt
--- old/kdeutils-3.95.1/kgpg/CMakeLists.txt     2007-10-31 21:44:50.000000000 
+0100
+++ new/kdeutils-3.96.0/kgpg/CMakeLists.txt     2007-11-06 09:01:38.000000000 
+0100
@@ -11,6 +11,7 @@
 set(core_SRCS
    core/convert.cpp
    core/images.cpp
+   core/emailvalidator.cpp
    core/kgpgkey.cpp )
 
 set(kgpg_SRCS ${core_SRCS}
@@ -74,7 +75,8 @@
 install( FILES kgpg.kcfg  DESTINATION ${KCFG_INSTALL_DIR})
 install( FILES kgpg.desktop  DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kgpg_anim.gif kgpg_docked.png  kgpg_docked.gif kgpg_blank.png  
kgpg_fill.png  DESTINATION ${DATA_INSTALL_DIR}/kgpg/pics)
-install( FILES encryptfile.desktop encryptfolder.desktop  DESTINATION 
${DATA_INSTALL_DIR}/konqueror/servicemenus)
+install( FILES encryptfile.desktop encryptfolder.desktop  DESTINATION
+${SERVICES_INSTALL_DIR}/ServiceMenus)
 install( FILES org.kde.kgpg.Key.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
 
 kde4_install_icons( ${ICON_INSTALL_DIR}   )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/core/emailvalidator.cpp 
new/kdeutils-3.96.0/kgpg/core/emailvalidator.cpp
--- old/kdeutils-3.95.1/kgpg/core/emailvalidator.cpp    1970-01-01 
01:00:00.000000000 +0100
+++ new/kdeutils-3.96.0/kgpg/core/emailvalidator.cpp    2007-11-06 
09:01:38.000000000 +0100
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Jimmy Gilles                                    *
+ *   jimmygilles@xxxxxxxxx                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
+ ***************************************************************************/
+
+#include "emailvalidator.h"
+
+#include <QRegExp>
+
+namespace KgpgCore
+{
+
+QValidator::State EmailValidator::validate(QString &input, int &) const
+{
+    static QString pattern = "^[a-z][a-z|0-9|]*([_][a-z|0-9]+)*([.][a-z|"
+                             
"0-9]+([_][a-z|0-9]+)*)?@[a-z][a-z|0-9|]*\\.([a-z]"
+                             "[a-z|0-9]*(\\.[a-z][a-z|0-9]*)?)$";
+
+    static QRegExp regexp(pattern, Qt::CaseInsensitive);
+
+    if (regexp.exactMatch(input))
+        return QValidator::Acceptable;
+    else
+        return QValidator::Invalid;
+}
+
+} // namespace KgpgCore
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/core/emailvalidator.h 
new/kdeutils-3.96.0/kgpg/core/emailvalidator.h
--- old/kdeutils-3.95.1/kgpg/core/emailvalidator.h      1970-01-01 
01:00:00.000000000 +0100
+++ new/kdeutils-3.96.0/kgpg/core/emailvalidator.h      2007-11-06 
09:01:38.000000000 +0100
@@ -0,0 +1,38 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Jimmy Gilles                                    *
+ *   jimmygilles@xxxxxxxxx                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
+ ***************************************************************************/
+
+#ifndef EMAILVALIDATOR_H
+#define EMAILVALIDATOR_H
+
+#include <QValidator>
+
+namespace KgpgCore
+{
+
+class EmailValidator : public QValidator
+{
+public:
+    explicit EmailValidator(QObject *parent = 0) : QValidator(parent) { }
+    virtual QValidator::State validate(QString &input, int &pos) const;
+};
+
+} // namespace KgpgCore
+
+#endif // EMAILVALIDATOR_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/core/kgpgkey.cpp 
new/kdeutils-3.96.0/kgpg/core/kgpgkey.cpp
--- old/kdeutils-3.95.1/kgpg/core/kgpgkey.cpp   2007-10-23 10:37:04.000000000 
+0200
+++ new/kdeutils-3.96.0/kgpg/core/kgpgkey.cpp   2007-11-14 01:26:10.000000000 
+0100
@@ -173,6 +173,7 @@
 bool KgpgKeyUatPrivate::operator==(const KgpgKeyUatPrivate &other) const
 {
     if (gpguatid != other.gpguatid) return false;
+    if (gpguatcreation != other.gpguatcreation) return false;
     if (gpgsignlist != other.gpgsignlist) return false;
     return true;
 }
@@ -194,11 +195,26 @@
     d->gpguatid = id;
 }
 
+void KgpgKeyUat::setCreation(const QDate &date)
+{
+    d->gpguatcreation = date;
+}
+
 QString KgpgKeyUat::id() const
 {
     return d->gpguatid;
 }
 
+QDate KgpgKeyUat::creationDate() const
+{
+    return d->gpguatcreation;
+}
+
+QString KgpgKeyUat::creation() const
+{
+    return Convert::toString(d->gpguatcreation);
+}
+
 void KgpgKeyUat::addSign(const KgpgKeySign &sign)
 {
     d->gpgsignlist << sign;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/core/kgpgkey.h 
new/kdeutils-3.96.0/kgpg/core/kgpgkey.h
--- old/kdeutils-3.95.1/kgpg/core/kgpgkey.h     2007-10-23 10:37:04.000000000 
+0200
+++ new/kdeutils-3.96.0/kgpg/core/kgpgkey.h     2007-11-14 01:26:10.000000000 
+0100
@@ -172,6 +172,7 @@
 {
 public:
     QString gpguatid;
+    QDate   gpguatcreation;
     KgpgKeySignList gpgsignlist;
 
     bool operator==(const KgpgKeyUatPrivate &other) const;
@@ -188,7 +189,10 @@
     KgpgKeyUat(const KgpgKeyUat &other);
 
     void setId(const QString &id);
+    void setCreation(const QDate &date);
     QString id() const;
+    QDate creationDate() const;
+    QString creation() const;
 
     void addSign(const KgpgKeySign &sign);
     KgpgKeySignList signList() const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/encryptfile.desktop 
new/kdeutils-3.96.0/kgpg/encryptfile.desktop
--- old/kdeutils-3.95.1/kgpg/encryptfile.desktop        2007-10-31 
21:44:50.000000000 +0100
+++ new/kdeutils-3.96.0/kgpg/encryptfile.desktop        2007-11-14 
01:26:10.000000000 +0100
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
-ServiceTypes=all/allfiles
+ServiceTypes=all/allfiles,KonqPopupMenu/Plugin
 ExcludeServiceTypes=kdedevice/*
 Actions=encrypt;
 
@@ -14,7 +14,7 @@
 Name[da]=Indkod fil
 Name[de]=Datei verschlüsseln
 Name[el]=Κρυπτογράφηση αρχείου
-Name[eo]=Ĉifru la dosieron
+Name[eo]=Ĉifri dosieron
 Name[es]=Cifrar fichero
 Name[et]=Krüpti fail
 Name[eu]=Fitxategiak Zifratu
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/encryptfolder.desktop 
new/kdeutils-3.96.0/kgpg/encryptfolder.desktop
--- old/kdeutils-3.95.1/kgpg/encryptfolder.desktop      2007-10-31 
21:44:50.000000000 +0100
+++ new/kdeutils-3.96.0/kgpg/encryptfolder.desktop      2007-11-14 
01:26:10.000000000 +0100
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Service
-ServiceTypes=inode/directory
+ServiceTypes=inode/directory,KonqPopupMenu/Plugin
 Actions=encrypt;
 
 [Desktop Action encrypt]
@@ -12,7 +12,7 @@
 Name[da]=Arkivér & kryptér mappe
 Name[de]=Ordner packen und verschlüsseln
 Name[el]=Αρχειοθέτηση & κρυπτογράφηση φακέλου
-Name[eo]=Arkivu kaj ĉifru la dosieron
+Name[eo]=Arkivigi kaj ĉifri dosierujon
 Name[es]=Archivar y cifrar carpeta
 Name[et]=Arhiveeri ja krüpti kataloog
 Name[eu]=Artxibatu eta enkriptatu karpeta
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/keylistview.cpp 
new/kdeutils-3.96.0/kgpg/keylistview.cpp
--- old/kdeutils-3.95.1/kgpg/keylistview.cpp    2007-10-31 21:44:50.000000000 
+0100
+++ new/kdeutils-3.96.0/kgpg/keylistview.cpp    2007-11-06 09:01:38.000000000 
+0100
@@ -723,7 +723,8 @@
     QStringList photolist = key.photoList();
     for (int i = 0; i < photolist.size(); ++i)
     {
-        tmpitem = new KeyListViewItem(item, i18n("Photo id"), QString(), 
QString(), "-", "-", "-", photolist.at(i), false, false, KeyListViewItem::Uat);
+        KgpgKeyUat uat = key.uatList()->at(i);
+        tmpitem = new KeyListViewItem(item, i18n("Photo id"), QString(), 
QString(), "-", "-", uat.creation(), photolist.at(i), false, false, 
KeyListViewItem::Uat);
         tmpitem->setPixmap(2, getTrustPix(key.trust(), key.valid()));
 
         if (m_displayphoto)
@@ -734,7 +735,6 @@
         else
             tmpitem->setPixmap(0, Images::photo());
 
-        KgpgKeyUat uat = key.uatList()->at(i);
         insertSigns(tmpitem, uat.signList());
     }
     /****************************************/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/keyservers.h 
new/kdeutils-3.96.0/kgpg/keyservers.h
--- old/kdeutils-3.95.1/kgpg/keyservers.h       2007-10-16 16:49:26.000000000 
+0200
+++ new/kdeutils-3.96.0/kgpg/keyservers.h       2007-11-14 01:26:10.000000000 
+0100
@@ -24,7 +24,6 @@
 #include "ui_searchres.h"
 #include "ui_keyserver.h"
 
-class KConfig;
 class K3ProcIO;
 class K3Process;
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/keysmanager.h 
new/kdeutils-3.96.0/kgpg/keysmanager.h
--- old/kdeutils-3.95.1/kgpg/keysmanager.h      2007-10-23 10:37:04.000000000 
+0200
+++ new/kdeutils-3.96.0/kgpg/keysmanager.h      2007-11-06 09:01:38.000000000 
+0100
@@ -75,8 +75,6 @@
 public:
     KeysManager(QWidget *parent = 0);
 
-    KeyListView *keysList2;
-
     KToggleAction *sTrust;
     KToggleAction *sCreat;
     KToggleAction *sExpi;
@@ -195,6 +193,8 @@
     void importRemoteFinished(KGpgTransaction *);
 
 private:
+    KeyListView *keysList2;
+
     QString globalkeyMail;
     QString globalkeyID;
     QString searchString;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/kgpg.cpp 
new/kdeutils-3.96.0/kgpg/kgpg.cpp
--- old/kdeutils-3.95.1/kgpg/kgpg.cpp   2007-10-25 11:32:06.000000000 +0200
+++ new/kdeutils-3.96.0/kgpg/kgpg.cpp   2007-11-06 09:01:38.000000000 +0100
@@ -1033,7 +1033,6 @@
         
connect(kgpg_applet->w,SIGNAL(updateDefault(QString)),this,SLOT(wizardOver(QString)));
         
connect(kgpg_applet->w,SIGNAL(createNewKey()),s_keyManager,SLOT(slotGenerateKey()));
         
connect(s_keyManager,SIGNAL(fontChanged(QFont)),kgpg_applet->w,SIGNAL(setFont(QFont)));
-        
connect(kgpg_applet->w,SIGNAL(importedKeys(QStringList)),s_keyManager->keysList2,SLOT(slotReloadKeys(QStringList)));
 
         if (KGpgSettings::showSystray()) {
             kgpg_applet->show();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/kgpg.desktop 
new/kdeutils-3.96.0/kgpg/kgpg.desktop
--- old/kdeutils-3.95.1/kgpg/kgpg.desktop       2007-10-31 21:44:50.000000000 
+0100
+++ new/kdeutils-3.96.0/kgpg/kgpg.desktop       2007-11-06 09:01:38.000000000 
+0100
@@ -66,7 +66,7 @@
 Comment[de]=Eine Benutzeroberfläche für GnuPG
 Comment[el]=Λογισμικό κρυπτογράφησης (GnuPG)
 Comment[eo]=Fasado por GnuPG
-Comment[es]=Entorno gráfico para GnuPG
+Comment[es]=Interfaz gráfica para GnuPG
 Comment[et]=GnuPG kasutajaliides
 Comment[eu]=GnuPGren bitarteko bat
 Comment[fa]=GnuPGنرم‌افزار نهایی
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/kgpg.h 
new/kdeutils-3.96.0/kgpg/kgpg.h
--- old/kdeutils-3.95.1/kgpg/kgpg.h     2007-10-23 10:37:04.000000000 +0200
+++ new/kdeutils-3.96.0/kgpg/kgpg.h     2007-11-06 09:01:38.000000000 +0100
@@ -69,7 +69,6 @@
     void readAgain2();
     void createNewKey();
     void updateDefault(QString);
-    void importedKeys(QStringList);
 
 public slots:
     /**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/kgpginterface.cpp 
new/kdeutils-3.96.0/kgpg/kgpginterface.cpp
--- old/kdeutils-3.95.1/kgpg/kgpginterface.cpp  2007-10-31 21:44:50.000000000 
+0100
+++ new/kdeutils-3.96.0/kgpg/kgpginterface.cpp  2007-11-06 09:01:38.000000000 
+0100
@@ -565,6 +565,7 @@
             m_numberid++;
             KgpgKeyUat uat;
             uat.setId(QString::number(m_numberid));
+            uat.setCreation(QDate::fromString(lsp.at(5), Qt::ISODate));
             m_publickey.uatList()->append(uat);
 
             cycle = "uat";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/kgpgkeygenerate.cpp 
new/kdeutils-3.96.0/kgpg/kgpgkeygenerate.cpp
--- old/kdeutils-3.95.1/kgpg/kgpgkeygenerate.cpp        2007-10-03 
13:47:41.000000000 +0200
+++ new/kdeutils-3.96.0/kgpg/kgpgkeygenerate.cpp        2007-11-06 
09:01:38.000000000 +0100
@@ -31,6 +31,9 @@
 #include <KDebug>
 #include <KHBox>
 
+#include "emailvalidator.h"
+
+using namespace KgpgCore;
 
 KgpgKeyGenerate::KgpgKeyGenerate(QWidget *parent)
                : KDialog(parent)
@@ -163,8 +166,9 @@
         if (result != KMessageBox::Continue)
             return;
     }
-    else
-    if (vmail.contains(' ') || !vmail.contains('.') || !vmail.contains('@'))
+
+    int pos = 0;
+    if (EmailValidator().validate(vmail, pos) == QValidator::Invalid)
     {
         KMessageBox::sorry(this, i18n("Email address not valid"));
         return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/kgpgkeygenerate.h 
new/kdeutils-3.96.0/kgpg/kgpgkeygenerate.h
--- old/kdeutils-3.95.1/kgpg/kgpgkeygenerate.h  2007-10-03 13:47:41.000000000 
+0200
+++ new/kdeutils-3.96.0/kgpg/kgpgkeygenerate.h  2007-11-06 09:01:38.000000000 
+0100
@@ -17,13 +17,10 @@
 #ifndef KGPGKEYGENERATE_H
 #define KGPGKEYGENERATE_H
 
-
-
 #include <KDialog>
 
 #include "kgpgkey.h"
 
-
 class KComboBox;
 class KLineEdit;
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kgpg/kgpglibrary.h 
new/kdeutils-3.96.0/kgpg/kgpglibrary.h
--- old/kdeutils-3.95.1/kgpg/kgpglibrary.h      2007-10-23 10:37:04.000000000 
+0200
+++ new/kdeutils-3.96.0/kgpg/kgpglibrary.h      2007-11-14 01:26:10.000000000 
+0100
@@ -27,7 +27,6 @@
 #include <QString>
 
 class KPassivePopup;
-class KJob;
 class KgpgInterface;
 
 class KgpgLibrary : public QObject
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/khexedit/khexedit.desktop 
new/kdeutils-3.96.0/khexedit/khexedit.desktop
--- old/kdeutils-3.95.1/khexedit/khexedit.desktop       2007-10-23 
10:37:05.000000000 +0200
+++ new/kdeutils-3.96.0/khexedit/khexedit.desktop       2007-11-14 
01:26:16.000000000 +0100
@@ -59,6 +59,7 @@
 GenericName[zh_TW]=二進位編輯器
 Name=KHexEdit
 Name[af]=Khex-redigeerder
+Name[eo]=Deksesuma redaktilo
 Name[pl]=Edytor binarny
 Name[sv]=Khexedit
 Name[ta]=KHexதொகுப்பு
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/khexedit/optiondialog.cc 
new/kdeutils-3.96.0/khexedit/optiondialog.cc
--- old/kdeutils-3.95.1/khexedit/optiondialog.cc        2007-10-03 
13:47:47.000000000 +0200
+++ new/kdeutils-3.96.0/khexedit/optiondialog.cc        2007-11-14 
01:26:16.000000000 +0100
@@ -353,7 +353,7 @@
   topLayout->setSpacing( spacingHint() );
   topLayout->setMargin( 0 );
 
-  text = i18n("&Use system colors (as chosen in Control Center)");
+  text = i18n("&Use system colors (as chosen in System Settings)");
   mColor.checkSystem = new QCheckBox( text, mColorPage->widget() );
   connect( mColor.checkSystem, SIGNAL(toggled(bool)),
           SLOT( slotColorSystem(bool)));
@@ -409,7 +409,7 @@
   topLayout->setSpacing( spacingHint() );
   topLayout->setMargin( 0 );
 
-  text = i18n("&Use system font (as chosen in Control Center)");
+  text = i18n("&Use system font (as chosen in System Settings)");
   mFont.checkSystem = new QCheckBox( text, mFontPage->widget() );
   connect( mFont.checkSystem, SIGNAL(toggled(bool)),
           this, SLOT( slotFontSystem(bool)));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/khexedit/parts/kbytesedit/kbytearrayedit.desktop 
new/kdeutils-3.96.0/khexedit/parts/kbytesedit/kbytearrayedit.desktop
--- old/kdeutils-3.95.1/khexedit/parts/kbytesedit/kbytearrayedit.desktop        
2007-10-03 13:47:45.000000000 +0200
+++ new/kdeutils-3.96.0/khexedit/parts/kbytesedit/kbytearrayedit.desktop        
2007-11-14 01:26:16.000000000 +0100
@@ -7,6 +7,7 @@
 Name[cy]=Celfigyn GolyguBeit
 Name[de]=BytesEdit-Bedienelement
 Name[el]=Γραφικό συστατικό BytesEdit
+Name[eo]=BytesEdit-fenestraĵo
 Name[es]=Ventana de edición de bytes
 Name[et]=Baitide redigeerimise komponent
 Name[eu]=Byteak Editatzeko Widget-a
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/khexedit/parts/kpart/oktetapart.desktop 
new/kdeutils-3.96.0/khexedit/parts/kpart/oktetapart.desktop
--- old/kdeutils-3.95.1/khexedit/parts/kpart/oktetapart.desktop 2007-10-03 
13:47:45.000000000 +0200
+++ new/kdeutils-3.96.0/khexedit/parts/kpart/oktetapart.desktop 2007-11-14 
01:26:16.000000000 +0100
@@ -10,6 +10,7 @@
 Name[da]=Indlejret binær fremviser
 Name[de]=Eingebettetes Anzeigeprogramm für Binärdateien
 Name[el]=Ενσωματωμένος προβολέας δυαδικών αρχείων
+Name[eo]=Enkonstruita duum-rigardilo
 Name[es]=Visor binario empotrado
 Name[et]=Põimitud binaarfailide näitaja
 Name[eu]=Ikusgailu binario txertagarria
@@ -55,6 +56,7 @@
 Comment[da]=Indlejret binær fremviser
 Comment[de]=Eingebettetes Anzeigeprogramm für Binärdateien
 Comment[el]=Ενσωματωμένος προβολέας δυαδικών αρχείων
+Comment[eo]=Enkonstruita duum-rigardilo
 Comment[es]=Visor binario empotrado
 Comment[et]=Põimitud binaarfailide näitaja
 Comment[eu]=Ikusgailu binario txertagarria
@@ -92,7 +94,7 @@
 Comment[x-test]=xxEmbedded Binary Viewerxx
 Comment[zh_CN]=嵌入式二进制查看器
 Comment[zh_TW]=嵌入式二進位顯示器
-MimeType=all/allfiles
+MimeType=all/allfiles;
 #MimeType=application/octet-stream
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
 #,KParts/ReadWritePart
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/klaptopdaemon/battery.cpp 
new/kdeutils-3.96.0/klaptopdaemon/battery.cpp
--- old/kdeutils-3.95.1/klaptopdaemon/battery.cpp       2007-10-03 
13:47:42.000000000 +0200
+++ new/kdeutils-3.96.0/klaptopdaemon/battery.cpp       2007-11-14 
01:26:11.000000000 +0100
@@ -224,9 +224,9 @@
         notifyme = config->readEntry("NotifyMe", false);
         useblanksaver = config->readEntry("BlankSaver", false);
 
-        nobattery = config->readEntry("NoBatteryPixmap", "laptop_nobattery");
+        nobattery = config->readEntry("NoBatteryPixmap", "battery-missing");
         nochargebattery = config->readEntry("NoChargePixmap", 
"laptop_nocharge");
-        chargebattery = config->readEntry("ChargePixmap", "laptop_charge");
+        chargebattery = config->readEntry("ChargePixmap", "battery-charging");
 
         runMonitor->setChecked(enablemonitor);
        blankSaver->setChecked(useblanksaver);
@@ -250,9 +250,9 @@
        useblanksaver = false;
        notifyme = false;
 
-        nobattery = "laptop_nobattery";
+        nobattery = "battery-missing";
         nochargebattery = "laptop_nocharge";
-        chargebattery = "laptop_charge";
+        chargebattery = "battery-charging";
 
         runMonitor->setChecked(enablemonitor);
         notifyMe->setChecked(notifyme);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/klaptopdaemon/daemondock.cpp 
new/kdeutils-3.96.0/klaptopdaemon/daemondock.cpp
--- old/kdeutils-3.95.1/klaptopdaemon/daemondock.cpp    2007-10-16 
16:49:26.000000000 +0200
+++ new/kdeutils-3.96.0/klaptopdaemon/daemondock.cpp    2007-11-14 
01:26:11.000000000 +0100
@@ -4,7 +4,7 @@
  *
  * This file contains the docked widget for the laptop battery monitor
  *
- * $Id: daemondock.cpp 725652 2007-10-15 22:24:08Z dfaure $
+ * $Id: daemondock.cpp 735151 2007-11-11 01:35:15Z pino $
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -70,7 +70,7 @@
 laptop_dock::SetupPopup()
 {
     rightPopup->clear();
-    rightPopup->insertTitle(SmallIcon("laptop_battery"), "KLaptop", 999);      
// otherwise we look like KDED
+    rightPopup->insertTitle(SmallIcon("battery"), "KLaptop", 999);     // 
otherwise we look like KDED
 
     int has_brightness = laptop_portable::has_brightness();
     int can_standby = laptop_portable::has_standby();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/klaptopdaemon/daemon_state.cpp 
new/kdeutils-3.96.0/klaptopdaemon/daemon_state.cpp
--- old/kdeutils-3.95.1/klaptopdaemon/daemon_state.cpp  2007-10-03 
13:47:42.000000000 +0200
+++ new/kdeutils-3.96.0/klaptopdaemon/daemon_state.cpp  2007-11-14 
01:26:11.000000000 +0100
@@ -9,7 +9,7 @@
  *
  * This file contains the implementation of the main laptop battery monitoring 
daemon
  *
- * $Id: daemon_state.cpp 541305 2006-05-15 21:52:34Z mueller $
+ * $Id: daemon_state.cpp 735416 2007-11-11 17:05:26Z pino $
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -146,9 +146,9 @@
         enabled = config->readEntry("Enable", true)&exists;
         notifyMeWhenFull = config->readEntry("NotifyMe", false)&exists;
        useBlankSaver = config->readEntry("BlankSaver", false);
-        noBatteryIcon = config->readEntry("NoBatteryPixmap", 
"laptop_nobattery");
+        noBatteryIcon = config->readEntry("NoBatteryPixmap", 
"battery-missing");
         noChargeIcon = config->readEntry("NoChargePixmap", "laptop_nocharge");
-        chargeIcon = config->readEntry("ChargePixmap", "laptop_charge");
+        chargeIcon = config->readEntry("ChargePixmap", "battery-charging");
 
 
        config->setGroup("BatteryLow");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/klaptopdaemon/laptop_daemon.cpp 
new/kdeutils-3.96.0/klaptopdaemon/laptop_daemon.cpp
--- old/kdeutils-3.95.1/klaptopdaemon/laptop_daemon.cpp 2007-10-03 
13:47:42.000000000 +0200
+++ new/kdeutils-3.96.0/klaptopdaemon/laptop_daemon.cpp 2007-11-14 
01:26:11.000000000 +0100
@@ -9,7 +9,7 @@
  *
  * This file contains the implementation of the main laptop battery monitoring 
daemon
  *
- * $Id: laptop_daemon.cpp 695780 2007-08-02 23:10:05Z mlaurent $
+ * $Id: laptop_daemon.cpp 735151 2007-11-11 01:35:15Z pino $
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -45,7 +45,6 @@
 #include <sys/ioctl.h>
 #include <kmessagebox.h>
 #include <kpassivepopup.h>
-#include <dcopclient.h>
 #include <qsocketnotifier.h>
 #include <qcursor.h>
 
@@ -53,13 +52,13 @@
 #include <sys/time.h>
 #include <libkworkspace/kworkspace.h>
 
-extern "C"
-{
-       KDE_EXPORT KDEDModule *create_klaptopdaemon(const Q3CString& name) {
-               return new laptop_daemon(name);
-        }
-}
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
 
+K_PLUGIN_FACTORY(LaptopDaemonFactory,
+                 registerPlugin<laptop_daemon>();
+    )
+K_EXPORT_PLUGIN(LaptopDaemonFactory("klaptopdaemon"))
 
 class XWidget: public QWidget {
 public:
@@ -70,7 +69,8 @@
 };
 bool XWidget::x11Event(XEvent *event) { return pd->x11Event(event); }
 
-laptop_daemon::laptop_daemon(const Q3CString& obj): KDEDModule(obj)
+laptop_daemon::laptop_daemon(QObject* parent, const QList<QVariant>&)
+    : KDEDModule(parent)
 {
        xwidget = new XWidget(this);
        xwidget->hide();
@@ -545,13 +545,13 @@
                 if (s.time_based_action_critical) {
                     KPassivePopup::message(i18n("Battery power is running 
out."),
                                            i18n("%1 % charge left.", num),
-                                           BarIcon("laptop_battery"), 
dock_widget,
+                                           BarIcon("battery"), dock_widget,
                                            0, 20000);
                 } else {
                     // Will this ever be reached?
                     KPassivePopup::message(i18n("Battery power is running 
out."),
                                            i18n("%1 % charge left.", num),
-                                           BarIcon("laptop_battery"), 
dock_widget,
+                                           BarIcon("battery"), dock_widget,
                                            0, 20000);
                 }
             }
@@ -559,12 +559,12 @@
                 if (s.time_based_action_low) {
                     KPassivePopup::message(i18n("Battery power is running 
out."),
                                            i18np("1 minute left.","%1 minutes 
left.", num),
-                                           BarIcon("laptop_battery"), 
dock_widget,
+                                           BarIcon("battery"), dock_widget,
                                            0, 20000);
                 } else {
                     KPassivePopup::message(i18n("Battery power is running 
out."),
                                            i18np("1% left.", "%1 percent 
left.", num),
-                                           BarIcon("laptop_battery"), 
dock_widget,
+                                           BarIcon("battery"), dock_widget,
                                            0, 20000);
                 }
             }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/klaptopdaemon/laptop_daemon.h 
new/kdeutils-3.96.0/klaptopdaemon/laptop_daemon.h
--- old/kdeutils-3.95.1/klaptopdaemon/laptop_daemon.h   2007-10-03 
13:47:42.000000000 +0200
+++ new/kdeutils-3.96.0/klaptopdaemon/laptop_daemon.h   2007-11-06 
09:01:39.000000000 +0100
@@ -6,7 +6,7 @@
  *
  * This file contains the implementation of the main laptop battery monitoring 
daemon
  *
- * $Id: laptop_daemon.h 684001 2007-07-05 21:21:16Z ossi $
+ * $Id: laptop_daemon.h 733093 2007-11-05 14:20:18Z dfaure $
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@
        Q_OBJECT
        K_DCOP
 public:
-       laptop_daemon(const Q3CString& obj);
+       laptop_daemon(QObject* parent, const QList<QVariant>&);
        ~laptop_daemon();
         void   setPollInterval(const int poll=60);
        void    SetBrightness(bool blank, int v);       // routine to do it
@@ -146,13 +146,13 @@
         KPCMCIA *_pcmcia;
 
        // sony jog-bar support
-       
+
        int  sony_fd;                   // file desc form open /dev/sonypi
        Display *sony_disp;             // X display
        QSocketNotifier *sony_notifier; // how we know data is waiting
 
-       // brightness 
-       
+       // brightness
+
        int  brightness;                // actual brightness, -1 if not known
 
        bool lid_state;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/klaptopdaemon/menus/klaptopdaemon.desktop 
new/kdeutils-3.96.0/klaptopdaemon/menus/klaptopdaemon.desktop
--- old/kdeutils-3.95.1/klaptopdaemon/menus/klaptopdaemon.desktop       
2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.0/klaptopdaemon/menus/klaptopdaemon.desktop       
2007-11-14 01:26:11.000000000 +0100
@@ -5,11 +5,10 @@
 ServiceTypes=KDEDModule
 X-KDE-ModuleType=Library
 X-KDE-Library=klaptopdaemon
-X-KDE-FactoryName=klaptopdaemon
 X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
 
-Icon=laptop_battery
+Icon=battery
 DocPath=kcontrol/battery-monitor.html
 Comment=Laptop battery monitor
 Comment[ar]=مراقب بطّاريّة الحاسوب المحمول
@@ -66,6 +65,7 @@
 Name[da]=Batteriovervågning for bærbar
 Name[de]=Akku-Überwachung
 Name[el]=Επόπτης μπαταρίας φορητού
+Name[eo]=Bateristato
 Name[es]=Monitor de batería del portátil
 Name[et]=Sülearvuti aku jälgija
 Name[eu]=Magalekoaren Bateria Begiralea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/klaptopdaemon/menus/laptop.desktop 
new/kdeutils-3.96.0/klaptopdaemon/menus/laptop.desktop
--- old/kdeutils-3.95.1/klaptopdaemon/menus/laptop.desktop      2007-10-31 
21:44:50.000000000 +0100
+++ new/kdeutils-3.96.0/klaptopdaemon/menus/laptop.desktop      2007-11-14 
01:26:11.000000000 +0100
@@ -4,7 +4,7 @@
 X-KDE-FactoryName=laptop
 X-KDE-Init=laptop
 Exec=kcmshell4 laptop
-Icon=laptop_battery
+Icon=battery
 Type=Application
 DocPath=kcontrol/laptop/index.html
 Categories=Qt;KDE;X-KDE-settings-power;
@@ -18,7 +18,7 @@
 Comment[da]=Batteri for bærbar
 Comment[de]=Notebook-Akku
 Comment[el]=Μπαταρία φορητού
-Comment[eo]=Avertilo por maplenigo de la baterio
+Comment[eo]=Avertilo pri malplenigo de la baterio
 Comment[es]=Batería del portátil
 Comment[et]=Sülearvuti aku
 Comment[eu]=Magalekoen Bateria
Files old/kdeutils-3.95.1/klaptopdaemon/pics/ox128-app-laptop_battery.png and 
new/kdeutils-3.96.0/klaptopdaemon/pics/ox128-app-laptop_battery.png differ
Files old/kdeutils-3.95.1/klaptopdaemon/pics/ox16-app-laptop_battery.png and 
new/kdeutils-3.96.0/klaptopdaemon/pics/ox16-app-laptop_battery.png differ
Files old/kdeutils-3.95.1/klaptopdaemon/pics/ox16-app-laptop_pcmcia.png and 
new/kdeutils-3.96.0/klaptopdaemon/pics/ox16-app-laptop_pcmcia.png differ
Files old/kdeutils-3.95.1/klaptopdaemon/pics/ox32-app-laptop_battery.png and 
new/kdeutils-3.96.0/klaptopdaemon/pics/ox32-app-laptop_battery.png differ
Files old/kdeutils-3.95.1/klaptopdaemon/pics/ox32-app-laptop_pcmcia.png and 
new/kdeutils-3.96.0/klaptopdaemon/pics/ox32-app-laptop_pcmcia.png differ
Files old/kdeutils-3.95.1/klaptopdaemon/pics/ox48-app-laptop_battery.png and 
new/kdeutils-3.96.0/klaptopdaemon/pics/ox48-app-laptop_battery.png differ
Files old/kdeutils-3.95.1/klaptopdaemon/pics/ox48-app-laptop_pcmcia.png and 
new/kdeutils-3.96.0/klaptopdaemon/pics/ox48-app-laptop_pcmcia.png differ
Files old/kdeutils-3.95.1/klaptopdaemon/pics/ox64-app-laptop_battery.png and 
new/kdeutils-3.96.0/klaptopdaemon/pics/ox64-app-laptop_battery.png differ
Files old/kdeutils-3.95.1/klaptopdaemon/pics/oxsc-app-laptop_battery.svgz and 
new/kdeutils-3.96.0/klaptopdaemon/pics/oxsc-app-laptop_battery.svgz differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kmilo/demo/kmilo_demo.desktop 
new/kdeutils-3.96.0/kmilo/demo/kmilo_demo.desktop
--- old/kdeutils-3.95.1/kmilo/demo/kmilo_demo.desktop   2007-10-31 
21:44:50.000000000 +0100
+++ new/kdeutils-3.96.0/kmilo/demo/kmilo_demo.desktop   2007-11-14 
01:26:24.000000000 +0100
@@ -10,6 +10,7 @@
 Name[da]=Demo-plugin
 Name[de]=Demo-Plugin
 Name[el]=Πρόσθετο επίδειξης
+Name[eo]=Demo-kromaĵo
 Name[es]=Complemento de demostración
 Name[et]=Demoplugin
 Name[eu]=Demo Plugina
@@ -59,6 +60,7 @@
 Comment[da]=Dette plugin gør ingenting.
 Comment[de]=Dieses Plugin macht nichts.
 Comment[el]=Αυτό το πρόσθετο δεν κάνει τίποτα.
+Comment[eo]=Tiu kromaĵo faras nenion.
 Comment[es]=Este complemento no hace nada.
 Comment[et]=See plugin ei tee mitte kui midagi.
 Comment[eu]=Plugin honek ez du ezer egiten.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kmilo/generic/kmilo_generic.desktop 
new/kdeutils-3.96.0/kmilo/generic/kmilo_generic.desktop
--- old/kdeutils-3.95.1/kmilo/generic/kmilo_generic.desktop     2007-10-31 
21:44:51.000000000 +0100
+++ new/kdeutils-3.96.0/kmilo/generic/kmilo_generic.desktop     2007-11-14 
01:26:25.000000000 +0100
@@ -11,6 +11,7 @@
 Name[da]=Generisk tastatur-plugin
 Name[de]=Allgemeines Tastatur-Plugin
 Name[el]=Γενικευμένο πρόσθετο πληκτρολογίου
+Name[eo]=Komuna klavar-kromprogramo
 Name[es]=Complemento de teclado genérico
 Name[et]=Tavaline klaviatuuriplugin
 Name[eu]=Teklatu Arruntaren Plugina
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kmilo/kmilod/kmilod.cpp 
new/kdeutils-3.96.0/kmilo/kmilod/kmilod.cpp
--- old/kdeutils-3.95.1/kmilo/kmilod/kmilod.cpp 2007-10-03 13:47:47.000000000 
+0200
+++ new/kdeutils-3.96.0/kmilo/kmilod/kmilod.cpp 2007-11-06 09:01:40.000000000 
+0100
@@ -37,18 +37,18 @@
 #include "kmilointerface.h"
 #include "kmilodadaptor.h"
 #include "defaultskin.h"
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
 
 using namespace KMilo;
 
-extern "C" {
-   KDE_EXPORT KDEDModule *create_kmilod() {
-          return new KMiloD();
-   }
-}
-
+K_PLUGIN_FACTORY(KMiloDFactory,
+                 registerPlugin<KMiloD>();
+    )
+K_EXPORT_PLUGIN(KMiloDFactory("kmilod"))
 
-KMiloD::KMiloD()
-       : KDEDModule(), _interval(100)
+KMiloD::KMiloD(QObject* parent, const QList<QVariant>&)
+       : KDEDModule(parent), _interval(100)
 {
        new KmilodAdaptor(this);
        _miface = new KMiloInterface(this);
@@ -116,7 +116,7 @@
 void KMiloD::enable() {
        if (!_monitors.isEmpty()) {
                _timer.setSingleShot(false);
-               _timer.start(_interval); 
+               _timer.start(_interval);
        }
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kmilo/kmilod/kmilod.desktop 
new/kdeutils-3.96.0/kmilo/kmilod/kmilod.desktop
--- old/kdeutils-3.95.1/kmilo/kmilod/kmilod.desktop     2007-10-03 
13:47:47.000000000 +0200
+++ new/kdeutils-3.96.0/kmilo/kmilod/kmilod.desktop     2007-11-14 
01:26:17.000000000 +0100
@@ -4,7 +4,6 @@
 ServiceTypes=KDEDModule
 X-KDE-ModuleType=Library
 X-KDE-Library=kmilod
-X-KDE-FactoryName=kmilod
 X-KDE-Kded-autoload=true
 X-KDE-Kded-load-on-demand=false
 Name=KMilo
@@ -20,6 +19,7 @@
 Comment[da]=KDE Speciel tast bekendtgørelse
 Comment[de]=Unterstützung für Sonder- und Multimediatasten in KDE
 Comment[el]=Ειδοποιητής ειδικών πλήκτρων του KDE
+Comment[eo]=KDE-specialklavatentigilo
 Comment[es]=Notificador de teclas especiales de KDE
 Comment[et]=KDE eriklahvide märkija
 Comment[eu]=KDE tekla berezien jakinarazlea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kmilo/kmilod/kmilod.h 
new/kdeutils-3.96.0/kmilo/kmilod/kmilod.h
--- old/kdeutils-3.95.1/kmilo/kmilod/kmilod.h   2007-10-03 13:47:47.000000000 
+0200
+++ new/kdeutils-3.96.0/kmilo/kmilod/kmilod.h   2007-11-06 09:01:40.000000000 
+0100
@@ -39,7 +39,7 @@
 class KMiloD : public KDEDModule {
        Q_OBJECT
        public:
-               KMiloD();
+               KMiloD(QObject* parent, const QList<QVariant>&);
                virtual ~KMiloD();
                void displayProgress(const QString& text, int progress, const 
QPixmap& customPixmap );
                void displayText(const QString& text, const QPixmap& 
customPixmap);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kmilo/thinkpad/kmilo_thinkpad.desktop 
new/kdeutils-3.96.0/kmilo/thinkpad/kmilo_thinkpad.desktop
--- old/kdeutils-3.95.1/kmilo/thinkpad/kmilo_thinkpad.desktop   2007-10-31 
21:44:50.000000000 +0100
+++ new/kdeutils-3.96.0/kmilo/thinkpad/kmilo_thinkpad.desktop   2007-11-14 
01:26:17.000000000 +0100
@@ -11,6 +11,7 @@
 Name[cy]=Ategyn Thinkpad
 Name[de]=Thinkpad-Plugin
 Name[el]=Πρόσθετο Thinkpad
+Name[eo]=Thinkpad-kromaĵo
 Name[es]=Complemento para Thinkpad
 Name[et]=Thinkpadi plugin
 Name[eu]=Thikpad Plugina
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kregexpeditor/kregexpeditor.desktop 
new/kdeutils-3.96.0/kregexpeditor/kregexpeditor.desktop
--- old/kdeutils-3.95.1/kregexpeditor/kregexpeditor.desktop     2007-10-31 
21:44:51.000000000 +0100
+++ new/kdeutils-3.96.0/kregexpeditor/kregexpeditor.desktop     2007-11-14 
01:26:26.000000000 +0100
@@ -23,6 +23,7 @@
 GenericName[da]=Editor for regulære udtryk
 GenericName[de]=Editor für reguläre Ausdrücke
 GenericName[el]=Επεξεργαστής κανονικών εκφράσεων
+GenericName[eo]=Redaktilo por regulesprimoj
 GenericName[es]=Editor de expresiones regulares
 GenericName[et]=Regulaaravaldiste redaktor
 GenericName[eu]=Adierazpen Erregularren Editorea
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ksim/library/common.h 
new/kdeutils-3.96.0/ksim/library/common.h
--- old/kdeutils-3.95.1/ksim/library/common.h   2007-10-03 13:47:42.000000000 
+0200
+++ new/kdeutils-3.96.0/ksim/library/common.h   2007-11-14 01:26:11.000000000 
+0100
@@ -36,8 +36,7 @@
   // a few forward declares
   class ThemeLoader;
   class Theme;
-      class Plugin;
-      
+            
   /**
    * class that all widgets (library dir only) HAVE to inherit
    * if they want to change items on ksim configuration reload
Files old/kdeutils-3.95.1/ksim/monitors/cpu/ox16-device-ksim_cpu.png and 
new/kdeutils-3.96.0/ksim/monitors/cpu/ox16-device-ksim_cpu.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ksim/monitors/lm_sensors/nv_control.h 
new/kdeutils-3.96.0/ksim/monitors/lm_sensors/nv_control.h
--- old/kdeutils-3.95.1/ksim/monitors/lm_sensors/nv_control.h   2007-10-03 
13:47:42.000000000 +0200
+++ new/kdeutils-3.96.0/ksim/monitors/lm_sensors/nv_control.h   2007-11-14 
01:26:12.000000000 +0100
@@ -14,7 +14,7 @@
  * along with this program; if not, write to the:
  *
  *           Free Software Foundation, Inc.
- *           51 Franklin Street, Suite 330
+ *           51 Franklin Street, Fifth Floor
  *           Boston, MA 02110-1301, USA
  *
  */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/ksim/monitors/mail/mail.desktop 
new/kdeutils-3.96.0/ksim/monitors/mail/mail.desktop
--- old/kdeutils-3.95.1/ksim/monitors/mail/mail.desktop 2007-10-31 
21:44:50.000000000 +0100
+++ new/kdeutils-3.96.0/ksim/monitors/mail/mail.desktop 2007-11-06 
09:01:40.000000000 +0100
@@ -66,6 +66,7 @@
 Name[da]=Post
 Name[el]=Αλληλογραφία
 Name[eo]=Retpoŝto
+Name[es]=Correo
 Name[et]=Kirjad
 Name[eu]=Posta
 Name[fa]=نامه
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kwallet/CMakeLists.txt 
new/kdeutils-3.96.0/kwallet/CMakeLists.txt
--- old/kdeutils-3.95.1/kwallet/CMakeLists.txt  2007-10-03 13:47:43.000000000 
+0200
+++ new/kdeutils-3.96.0/kwallet/CMakeLists.txt  2007-11-06 09:01:40.000000000 
+0100
@@ -19,6 +19,8 @@
    allyourbase.cpp 
    kbetterthankdialogbase.cpp )
 
+qt4_add_dbus_interface(kwalletmanager_SRCS 
${DBUS_INTERFACES_INSTALL_DIR}/org.kde.KWallet.xml kwallet_interface)
+
 kde4_add_ui_files(kwalletmanager_SRCS walletwidget.ui 
kbetterthankdialogbase.ui)
 
 kde4_add_executable(kwalletmanager ${kwalletmanager_SRCS})
Files old/kdeutils-3.95.1/kwallet/icons/ox22-action-wallet_closed.png and 
new/kdeutils-3.96.0/kwallet/icons/ox22-action-wallet_closed.png differ
Files old/kdeutils-3.95.1/kwallet/icons/ox22-action-wallet_open.png and 
new/kdeutils-3.96.0/kwallet/icons/ox22-action-wallet_open.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/kwallet/konfigurator/kwalletmanager_show.desktop 
new/kdeutils-3.96.0/kwallet/konfigurator/kwalletmanager_show.desktop
--- old/kdeutils-3.95.1/kwallet/konfigurator/kwalletmanager_show.desktop        
2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.0/kwallet/konfigurator/kwalletmanager_show.desktop        
2007-11-06 09:01:40.000000000 +0100
@@ -53,7 +53,7 @@
 Name[zh_CN]=钱包管理工具
 Name[zh_TW]=錢包管理工具
 Exec=kwalletmanager --show
-MimeType=application/x-kde-wallet
+MimeType=application/x-kde-wallet;
 InitialPreference=6
 Icon=kwalletmanager
 Type=Service
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kwallet/kwalletmanager.cpp 
new/kdeutils-3.96.0/kwallet/kwalletmanager.cpp
--- old/kdeutils-3.95.1/kwallet/kwalletmanager.cpp      2007-10-03 
13:47:43.000000000 +0200
+++ new/kdeutils-3.96.0/kwallet/kwalletmanager.cpp      2007-11-14 
01:26:15.000000000 +0100
@@ -22,7 +22,7 @@
 #include "kwalletpopup.h"
 #include "kwalleteditor.h"
 #include "allyourbase.h"
-#include <QtDBus>
+#include "kwallet_interface.h"
 
 #include <kaction.h>
 #include <kapplication.h>
@@ -38,20 +38,15 @@
 #include <ksystemtrayicon.h>
 #include <kwallet.h>
 #include <kxmlguifactory.h>
-#include <q3accel.h>
 #include <qpointer.h>
 #include <q3ptrstack.h>
 #include <QRegExp>
 
 #include <qtimer.h>
-//Added by qt3to4:
-#include <QPixmap>
 #include <ktoolinvocation.h>
-#include <qdbusconnection.h>
 #include <kicon.h>
 #include <kactioncollection.h>
 #include <kconfiggroup.h>
-#define KWALLETMANAGERINTERFACE "org.kde.KWallet"
 
 KWalletManager::KWalletManager(QWidget *parent, const char *name, Qt::WFlags f)
     : KXmlGuiWindow(parent, f)
@@ -60,25 +55,20 @@
     QDBusConnection::sessionBus().registerObject("/KWalletManager", this, 
QDBusConnection::ExportScriptableSlots);
        KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
        _kwalletdLaunch = false;
-       Q3Accel *accel = new Q3Accel(this, "kwalletmanager");
-#ifdef __GNUC__
-#warning "kde4: dbus port how ?"
-#endif 
-       //KApplication::dcopClient()->setQtBridgeEnabled(false);
        _shuttingDown = false;
        KConfig cfg("kwalletrc"); // not sure why this setting isn't in 
kwalletmanagerrc...
        KConfigGroup walletConfigGroup(&cfg, "Wallet");
        if (walletConfigGroup.readEntry("Launch Manager", true)) {
                _tray = new KSystemTrayIcon(this);
                _tray->setObjectName("kwalletmanager tray");
-               _tray->setIcon(loadSystemTrayIcon("wallet_closed"));
+               _tray->setIcon(loadSystemTrayIcon("wallet-closed"));
                _tray->setToolTip( i18n("KDE Wallet: No wallets open."));
                connect(_tray, SIGNAL(quitSelected()), SLOT(shuttingDown()));
                const QStringList wl = KWallet::Wallet::walletList();
                bool isOpen = false;
                for (QStringList::ConstIterator it = wl.begin(); it != 
wl.end(); ++it) {
                        if (KWallet::Wallet::isOpen(*it)) {
-                               
_tray->setIcon(loadSystemTrayIcon("wallet_open"));
+                               
_tray->setIcon(loadSystemTrayIcon("wallet-open"));
                                _tray->setToolTip( i18n("KDE Wallet: A wallet 
is open."));
                                isOpen = true;
                                break;
@@ -102,35 +92,21 @@
        setCentralWidget(_iconView);
        _iconView->setMinimumSize(320, 200);
 
-        m_kwalletdModule = new QDBusInterface("org.kde.kded", 
"/modules/kwalletd", KWALLETMANAGERINTERFACE);
-        if ( !m_kwalletdModule->isValid() )
-            kWarning() << "kded not running?" ;
-        else
-        {
-#ifdef __GNUC__
-#warning "kde4: port to dbus";
-#endif         
-#if 0
-            connect(_dcopRef->dcopClient(),
-                    SIGNAL(applicationRemoved(const QByteArray&)),
-                    this,
-                    SLOT(possiblyRescan(const QByteArray&)));
-            connect(_dcopRef->dcopClient(),
-                    SIGNAL(applicationRegistered(const QByteArray&)),
-                    this,
-                    SLOT(possiblyRescan(const QByteArray&)));
-#endif
-            connect( m_kwalletdModule, SIGNAL(allWalletsClosed()),
-                     this, SLOT(allWalletsClosed() ) );
-            connect( m_kwalletdModule, SIGNAL(walletClosed(QString)),
-                     this, SLOT(updateWalletDisplay()) );
-            connect( m_kwalletdModule, SIGNAL(walletOpened(QString)),
-                     this, SLOT(aWalletWasOpened()) );
-            connect( m_kwalletdModule, SIGNAL(walletDeleted(QString)),
-                  this, SLOT(updateWalletDisplay()) );
-            connect( m_kwalletdModule, SIGNAL(walletListDirty()),
-                  this, SLOT(updateWalletDisplay()) );
-        }
+        m_kwalletdModule = new org::kde::KWallet("org.kde.kded", 
"/modules/kwalletd", QDBusConnection::sessionBus());
+        connect(QDBusConnection::sessionBus().interface(),
+                SIGNAL(serviceOwnerChanged(QString,QString,QString)),
+                this,
+                SLOT(possiblyRescan(QString,QString,QString)));
+        connect( m_kwalletdModule, SIGNAL(allWalletsClosed()),
+                 this, SLOT(allWalletsClosed() ) );
+        connect( m_kwalletdModule, SIGNAL(walletClosed(QString)),
+                 this, SLOT(updateWalletDisplay()) );
+        connect( m_kwalletdModule, SIGNAL(walletOpened(QString)),
+                 this, SLOT(aWalletWasOpened()) );
+        connect( m_kwalletdModule, SIGNAL(walletDeleted(QString)),
+                 this, SLOT(updateWalletDisplay()) );
+        connect( m_kwalletdModule, SIGNAL(walletListDirty()),
+                 this, SLOT(updateWalletDisplay()) );
        // FIXME: slight race - a wallet can open, then we get launched, but the
        //        wallet closes before we are done opening.  We will then stay
        //        open.  Must check that a wallet is still open here.
@@ -138,18 +114,18 @@
        QAction *action = actionCollection()->addAction("wallet_create");
        action->setText(i18n("&New Wallet..."));
        action->setIcon(KIcon("kwalletmanager"));
-       connect(action, SIGNAL(triggered(bool) ), SLOT(createWallet()));
+       connect(action, SIGNAL(triggered()), SLOT(createWallet()));
        QAction *act = actionCollection()->addAction("wallet_settings");
        act->setText(i18n("Configure &Wallet..."));
        act->setIcon(KIcon("configure"));
 
-       connect(act, SIGNAL(triggered(bool) ), SLOT(setupWallet()));
+       connect(act, SIGNAL(triggered()), SLOT(setupWallet()));
        if (_tray) {
                _tray->contextMenu()->addAction( act );
        }
        act = actionCollection()->addAction("close_all_wallets");
        act->setText(i18n("Close &All Wallets"));
-       connect(act, SIGNAL(triggered(bool) ), SLOT(closeAllWallets()));
+       connect(act, SIGNAL(triggered()), SLOT(closeAllWallets()));
        if (_tray) {
                _tray->contextMenu()->addAction( act );
        }
@@ -158,8 +134,14 @@
 actionCollection());
 
        createGUI("kwalletmanager.rc");
-       accel->connectItem(accel->insertItem(Qt::Key_Return), this, 
SLOT(openWallet()));
-       accel->connectItem(accel->insertItem(Qt::Key_Delete), this, 
SLOT(deleteWallet()));
+
+        KAction* openWalletAction = new KAction(i18n("Open Wallet"), 
actionCollection());
+        openWalletAction->setShortcut(Qt::Key_Return);
+        connect(openWalletAction, SIGNAL(triggered()), this, 
SLOT(openWallet()));
+
+        KAction* deleteWalletAction = new KAction(i18n("Delete Wallet"), 
actionCollection());
+        deleteWalletAction->setShortcut(Qt::Key_Delete);
+        connect(deleteWalletAction, SIGNAL(triggered()), this, 
SLOT(deleteWallet()));
 
        if (_tray) {
                _tray->show();
@@ -198,7 +180,7 @@
 
 void KWalletManager::aWalletWasOpened() {
        if (_tray) {
-               _tray->setIcon(loadSystemTrayIcon("wallet_open"));
+               _tray->setIcon(loadSystemTrayIcon("wallet-open"));
                _tray->setToolTip( i18n("KDE Wallet: A wallet is open."));
        }
        updateWalletDisplay();
@@ -206,8 +188,8 @@
 
 
 void KWalletManager::updateWalletDisplay() {
-QStringList wl = KWallet::Wallet::walletList();
-Q3PtrStack<Q3IconViewItem> trash;
+    QStringList wl = KWallet::Wallet::walletList();
+    Q3PtrStack<Q3IconViewItem> trash;
 
        for (Q3IconViewItem *item = _iconView->firstItem(); item; item = 
item->nextItem()) {
                if (!wl.contains(item->text())) {
@@ -342,7 +324,7 @@
 
 void KWalletManager::allWalletsClosed() {
        if (_tray) {
-               _tray->setIcon(loadSystemTrayIcon("wallet_closed"));
+               _tray->setIcon(loadSystemTrayIcon("wallet-closed"));
                _tray->setToolTip( i18n("KDE Wallet: No wallets open."));
        }
        possiblyQuit();
@@ -366,8 +348,10 @@
 }
 
 
-void KWalletManager::possiblyRescan(const QByteArray& app) {
-       if (app == "kded") {
+void KWalletManager::possiblyRescan(const QString& app, const QString& 
oldOwner, const QString& newOwner) {
+       Q_UNUSED( oldOwner );
+       Q_UNUSED( newOwner );
+       if (app == "org.kde.kded") {
                updateWalletDisplay();
        }
 }
@@ -428,7 +412,7 @@
 
 
 void KWalletManager::closeAllWallets() {
-    m_kwalletdModule->call( "closeAllWallets");
+    m_kwalletdModule->closeAllWallets();
 }
 
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kwallet/kwalletmanager.h 
new/kdeutils-3.96.0/kwallet/kwalletmanager.h
--- old/kdeutils-3.95.1/kwallet/kwalletmanager.h        2007-10-03 
13:47:43.000000000 +0200
+++ new/kdeutils-3.96.0/kwallet/kwalletmanager.h        2007-11-14 
01:26:15.000000000 +0100
@@ -22,14 +22,12 @@
 #include <QtCore/QObject>
 #include <kxmlguiwindow.h>
 #include <q3ptrlist.h>
-//Added by qt3to4:
-#include <QPixmap>
 #include <QIcon>
 
 class KSystemTrayIcon;
 class KWalletIconView;
 class Q3IconViewItem;
-class QDBusInterface;
+class OrgKdeKWalletInterface;
 
 class KWalletManager : public KXmlGuiWindow {
        Q_OBJECT
@@ -68,7 +66,7 @@
                void shuttingDown();
                void possiblyQuit();
                void editorClosed(KXmlGuiWindow* e);
-               void possiblyRescan(const QByteArray& app);
+               void possiblyRescan(const QString& app, const QString&, const 
QString&);
                void setupWallet();
                void openWallet();
                void deleteWallet();
@@ -78,7 +76,7 @@
                KSystemTrayIcon *_tray;
                bool _shuttingDown;
                KWalletIconView *_iconView;
-               QDBusInterface *m_kwalletdModule;
+               OrgKdeKWalletInterface *m_kwalletdModule;
                Q3PtrList<KXmlGuiWindow> _windows;
                bool _kwalletdLaunch;
 };
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kwallet/kwalletpopup.cpp 
new/kdeutils-3.96.0/kwallet/kwalletpopup.cpp
--- old/kdeutils-3.95.1/kwallet/kwalletpopup.cpp        2007-10-23 
10:37:05.000000000 +0200
+++ new/kdeutils-3.96.0/kwallet/kwalletpopup.cpp        2007-11-14 
01:26:15.000000000 +0100
@@ -42,7 +42,7 @@
        connect(act, SIGNAL(triggered(bool)), SLOT(createWallet()));
        addAction( act );
 
-        act= ac->addAction( "wallet_open" );
+        act= ac->addAction( "wallet-open" );
         act->setText( i18n( "&Open..." ) );
        connect(act, SIGNAL(triggered(bool)), SLOT(openWallet()));
        act->setShortcut(QKeySequence(Qt::Key_Return));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/kwallet/main.cpp 
new/kdeutils-3.96.0/kwallet/main.cpp
--- old/kdeutils-3.95.1/kwallet/main.cpp        2007-10-03 13:47:43.000000000 
+0200
+++ new/kdeutils-3.96.0/kwallet/main.cpp        2007-11-06 09:01:40.000000000 
+0100
@@ -67,8 +67,6 @@
        KWalletManager wm;
        wm.setCaption(i18n("KDE Wallet Manager"));
 
-       a.setMainWidget(&wm);
-
        KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
 
        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/superkaramba/skapplet/skapplet.cpp 
new/kdeutils-3.96.0/superkaramba/skapplet/skapplet.cpp
--- old/kdeutils-3.95.1/superkaramba/skapplet/skapplet.cpp      2007-10-25 
11:32:10.000000000 +0200
+++ new/kdeutils-3.96.0/superkaramba/skapplet/skapplet.cpp      2007-11-14 
01:26:28.000000000 +0100
@@ -119,6 +119,7 @@
 
     kDebug() << "========================> SuperKarambaApplet Ctor" << args ;
     setHasConfigurationInterface(true);
+    setDrawStandardBackground(false);
 
     if (args.count() < 3) {
         KConfigGroup cg = config();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/superkaramba/skapplet/skwidgetadaptor.h 
new/kdeutils-3.96.0/superkaramba/skapplet/skwidgetadaptor.h
--- old/kdeutils-3.95.1/superkaramba/skapplet/skwidgetadaptor.h 2007-10-03 
13:47:49.000000000 +0200
+++ new/kdeutils-3.96.0/superkaramba/skapplet/skwidgetadaptor.h 2007-11-14 
01:26:28.000000000 +0100
@@ -164,8 +164,8 @@
             }
             m_svg->paint(painter->painter(), point, elementID);
         }
-        void updated(const QString& source, Plasma::DataEngine::Data) {
-            kDebug() << "SvgAdaptor::updated source=" << source ;
+        void dataUpdated(const QString& source, Plasma::DataEngine::Data) {
+            kDebug() << "SvgAdaptor::dataUpdated source=" << source ;
         }
     private:
         Plasma::Svg* m_svg;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/superkaramba/src/karamba.cpp 
new/kdeutils-3.96.0/superkaramba/src/karamba.cpp
--- old/kdeutils-3.95.1/superkaramba/src/karamba.cpp    2007-10-16 
16:49:28.000000000 +0200
+++ new/kdeutils-3.96.0/superkaramba/src/karamba.cpp    2007-11-14 
01:26:28.000000000 +0100
@@ -1592,8 +1592,11 @@
 
 void Karamba::popupMenu(KMenu *menu, const QPoint &pos) const
 {
-//  QPoint diff = mapToGlobal(QGraphicsItemGroup::pos().toPoint()).toPoint();
-    menu->popup(d->view->pos() + pos + boundingRect().toRect().topLeft());
+    if (!d->globalView) {
+        menu->popup(d->view->pos() + pos + boundingRect().toRect().topLeft());
+    } else {
+        menu->popup(mapToScene(pos).toPoint());
+    }
 }
 
 void Karamba::deletePopupMenu(KMenu *menu)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/superkaramba/src/meters/textlabel.cpp 
new/kdeutils-3.96.0/superkaramba/src/meters/textlabel.cpp
--- old/kdeutils-3.95.1/superkaramba/src/meters/textlabel.cpp   2007-10-03 
13:47:50.000000000 +0200
+++ new/kdeutils-3.96.0/superkaramba/src/meters/textlabel.cpp   2007-11-06 
09:01:40.000000000 +0100
@@ -119,24 +119,26 @@
     }
 
     if (getWidth() <= 0) {
-        Meter::setWidth(textSize.width());
+        setWidth(textSize.width());
     }
 
     if (getHeight() <= 0) {
-       Meter::setHeight(textSize.height());
+        setHeight(textSize.height());
     }
 
     if (!m_sizeGiven) {
         if (alignment == Qt::AlignLeft) {
-            Meter::setX(origPoint.x());
+            setX(origPoint.x());
         }
         else if (alignment == Qt::AlignRight) {
-            Meter::setX(origPoint.x() - textSize.width());
+            setX(origPoint.x() - textSize.width());
         }
         else if (alignment == Qt::AlignHCenter) {
-            Meter::setX(origPoint.x() - textSize.width() / 2);
+            setX(origPoint.x() - textSize.width() / 2);
         }
     }
+
+    update();
 }
 
 void TextLabel::setValue(const QString &text)
@@ -144,7 +146,6 @@
     value = text.split('\n');
 
     calculateTextSize();
-    update();
 }
 
 void TextLabel::setValue(int v)
@@ -152,7 +153,6 @@
     value = QStringList(QString::number(v));
 
     calculateTextSize();
-    update();
 }
 
 void TextLabel::setBGColor(QColor clr)
@@ -452,3 +452,13 @@
     QFontMetrics fm(font);
     return fm.width(value[0]);
 }
+
+void TextLabel::setSize(int x, int y, int width, int height)
+{
+    origPoint = QPoint(x, y);
+    setWidth(width);
+    setHeight(height);
+
+    calculateTextSize();
+}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/superkaramba/src/meters/textlabel.h 
new/kdeutils-3.96.0/superkaramba/src/meters/textlabel.h
--- old/kdeutils-3.95.1/superkaramba/src/meters/textlabel.h     2007-10-03 
13:47:50.000000000 +0200
+++ new/kdeutils-3.96.0/superkaramba/src/meters/textlabel.h     2007-11-06 
09:01:40.000000000 +0100
@@ -67,6 +67,7 @@
     bool clickable();
 
     int getTextWidth() const;
+    void setSize(int x, int y, int width, int height);
 
 private:
     int alignment;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/superkaramba/src/sensors/plasmaengine.cpp 
new/kdeutils-3.96.0/superkaramba/src/sensors/plasmaengine.cpp
--- old/kdeutils-3.95.1/superkaramba/src/sensors/plasmaengine.cpp       
2007-10-03 13:47:50.000000000 +0200
+++ new/kdeutils-3.96.0/superkaramba/src/sensors/plasmaengine.cpp       
2007-11-14 01:26:28.000000000 +0100
@@ -102,9 +102,9 @@
     d->format = format;
 }
 
-void PlasmaSensorConnector::updated(const QString& source, const 
Plasma::DataEngine::Data &data)
+void PlasmaSensorConnector::dataUpdated(const QString& source, const 
Plasma::DataEngine::Data &data)
 {
-    //kDebug()<<"PlasmaSensorConnector::updated d->source="<<d->source<<" 
source="<<source<<endl;
+    //kDebug()<<"PlasmaSensorConnector::dataUpdated d->source="<<d->source<<" 
source="<<source<<endl;
     if( d->source.isEmpty() ) {
         emit sourceUpdated(source, dataToMap(data));
         return;
@@ -259,9 +259,9 @@
     */
 }
 
-void PlasmaSensor::updated(const QString& source, Plasma::DataEngine::Data 
data)
+void PlasmaSensor::dataUpdated(const QString& source, Plasma::DataEngine::Data 
data)
 {
-    //kDebug()<<"PlasmaSensor::updated source="<<source<<endl;
+    //kDebug()<<"PlasmaSensor::dataUpdated source="<<source<<endl;
     emit sourceUpdated(source, dataToMap(data));
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kdeutils-3.95.1/superkaramba/src/sensors/plasmaengine.h 
new/kdeutils-3.96.0/superkaramba/src/sensors/plasmaengine.h
--- old/kdeutils-3.95.1/superkaramba/src/sensors/plasmaengine.h 2007-10-03 
13:47:50.000000000 +0200
+++ new/kdeutils-3.96.0/superkaramba/src/sensors/plasmaengine.h 2007-11-14 
01:26:28.000000000 +0100
@@ -81,7 +81,7 @@
         /**
         * Plasma calls this if data changed.
         */
-        void updated(const QString& source, const Plasma::DataEngine::Data 
&data);
+        void dataUpdated(const QString& source, const Plasma::DataEngine::Data 
&data);
 
     private:
         /// \internal d-pointer class.
@@ -189,7 +189,7 @@
         /**
         * Plasma calls this if data changed.
         */
-        virtual void updated(const QString& source, Plasma::DataEngine::Data 
data);
+        virtual void dataUpdated(const QString& source, 
Plasma::DataEngine::Data data);
 
     private:
         /// \internal d-pointer class.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kdeutils-3.95.1/superkaramba/src/superkaramba.desktop 
new/kdeutils-3.96.0/superkaramba/src/superkaramba.desktop
--- old/kdeutils-3.95.1/superkaramba/src/superkaramba.desktop   2007-10-03 
13:47:50.000000000 +0200
+++ new/kdeutils-3.96.0/superkaramba/src/superkaramba.desktop   2007-11-14 
01:26:29.000000000 +0100
@@ -60,6 +60,7 @@
 GenericName[da]=Desktopkontroller
 GenericName[de]=Arbeitsflächen-Erweiterungen
 GenericName[el]=Γραφικά συστατικά επιφάνειας εργασίας
+GenericName[eo]=Tabulaj fenestraĵoj
 GenericName[es]=Elementos visuales para el escritorio
 GenericName[et]=Töölauavidinad
 GenericName[eu]=Mahaigaineko trepetak



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx