Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcheckpass/kcheckpass.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcheckpass/kcheckpass.c
***********************************
90a91,93
> #ifdef HAVE_GETPASSPHRASE
> 	    p = getpassphrase(prompt ? prompt : "Password: ");
> #else
91a95
> #endif
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksmserver/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksmserver/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksmserver/server.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksmserver/server.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksmserver/server.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksmserver/server.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksmserver/KSMServerInterface.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksmserver/KSMServerInterface.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/katemain.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/katemain.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/kwritemain.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/kwritemain.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/kateviewspace.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/kateviewspace.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/kateapp.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/kateapp.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/kateapp.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/kateapp.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/kateconfigdialog.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/kateconfigdialog.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/katedocmanager.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/katedocmanager.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/katemainwindow.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/katemainwindow.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/katepluginmanager.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/katepluginmanager.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/kateprojectmanager.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/kateprojectmanager.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/kateexternaltools.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/kateexternaltools.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kate/app/kateviewspacecontainer.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kate/app/kateviewspacecontainer.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdepasswd/kcm/chfnprocess.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdepasswd/kcm/chfnprocess.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdepasswd/passwd.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdepasswd/passwd.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/fonts/kxftconfig.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/fonts/kxftconfig.cpp
***********************************
36a37
> #include <kdebug.h>
158a160,216
> 
> inline QString fileSyntax(const QString &f) { return xDirSyntax(f); }
> //
> // Obtain location of config file to use.
> //
> // For system, prefer the following:
> //
> //     <...>/config.d/00kde   = preferred method from FontConfig >= 2.3
> //     <...>/local.conf
> //
> // Non-system, prefer:
> //
> //     $HOME/<...>/.fonts.conf
> //     $HOME/<...>/fonts.conf
> //
> QString getConfigFile(bool system)
> {
> #if (FC_VERSION>=20300)
>     static const char * constKdeRootFcFile="00kde";
> #endif
> 
>     FcStrList   *list=FcConfigGetConfigFiles(FcConfigGetCurrent());
>     QStringList files;
>     FcChar8     *file;
>     QString     home(dirSyntax(QDir::homeDirPath()));
> 
>     while((file=FcStrListNext(list)))
>     {
>         QString f((const char *)file);
> 
>         if(fExists(f))
>         {
>             if(system || 0==fileSyntax(f).find(home)) // For nonsystem, only consider file within $HOME
>                 files.append(f);
>         }
> #if (FC_VERSION>=20300)
>         else if(system && dExists(f) && -1!=f.find(QRegExp("/conf\\.d/?$")))
>             return dirSyntax(f)+constKdeRootFcFile;   // This ones good enough for me!
> #endif
>     }
> 
>     //
>     // Go through list of files, looking for the preferred one...
>     if(files.count())
>     {
>         QStringList::Iterator it(files.begin()),
>                               end(files.end());
> 
>         for(; it!=end; ++it)
>             if(-1!=(*it).find(QRegExp(system ? "/local\\.conf$" : "/\\.?fonts\\.conf$")))
>                 return *it;
>         return files.front();  // Just return the 1st one...
>     }
>     else
>         return system ? "/etc/fonts/local.conf" : fileSyntax(home+"/.fonts.conf"); // Hmmm... no known files?
> }
> 
347,350c405
< #ifdef HAVE_FONTCONFIG
< static const QString defaultPath("/etc/fonts/local.conf");
< static const QString defaultUserFile(".fonts.conf");
< #else
---
> #ifndef HAVE_FONTCONFIG
354d408
< #endif
356d409
< #ifndef HAVE_FONTCONFIG
376,377d428
<     if(system) 
<     {
379c430,431
<         m_file=defaultPath;
---
>     m_file=getConfigFile(system);
>     kdDebug(1208) << "Using fontconfig file:" << m_file << endl;
380a433,434
>     if(system) 
>     {
389d442
< #endif
392d444
<     {
394,395c446
<     }
< 
---
> #endif
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/kcontrol/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/kcontrol/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/info/memory.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/info/memory.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/info/memory_solaris.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/info/memory_solaris.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/info/memory.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/info/memory.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/info/info_solaris.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/info/info_solaris.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/kfontinst/kfontinst/FontEngine.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/kfontinst/kfontinst/FontEngine.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/kfontinst/kfontinst/FontEngine.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/kfontinst/kfontinst/FontEngine.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/kfontinst/kfontinst/GetPid.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/kfontinst/kfontinst/GetPid.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/kfontinst/kfontinst/Fontmap.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/kfontinst/kfontinst/Fontmap.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/kfontinst/kfontinst/Main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/kfontinst/kfontinst/Main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/kfontinst/kio/KioFonts.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/kfontinst/kio/KioFonts.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/kfontinst/kfile-plugin/KFileFont.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/dnssd/kcmdnssd.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/dnssd/kcmdnssd.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcontrol/dnssd/kcmdnssd.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcontrol/dnssd/kcmdnssd.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kcminit/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kcminit/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdmlib/dmctl.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdmlib/dmctl.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdmlib/kgreet_classic.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdmlib/kgreet_classic.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./khelpcenter/application.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./khelpcenter/application.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./khelpcenter/application.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./khelpcenter/application.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./khelpcenter/infotree.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./khelpcenter/infotree.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./klipper/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./klipper/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/proxy/appletproxy.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/proxy/appletproxy.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/proxy/extensionproxy.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/proxy/extensionproxy.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/menuext/remote/remotemenu.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/menuext/remote/remotemenu.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/menuext/remote/remotemenu_skel.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/menuext/remote/remotemenu_skel.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/core/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/core/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/core/menumanager.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/core/menumanager.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/core/panelextension.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/core/panelextension.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/core/panelextension.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/core/panelextension.cpp
***********************************
150c150
<         if ( me->button() == RightButton )
---
>         if (me->button() == RightButton && kapp->authorize("action/kicker_rmb"))
158c158
< 
---
>     else
275a276,277
>     if (kapp->authorize("action/help"))
>     {
277a280
>     }
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/core/kicker.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/core/kicker.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/core/kicker.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/core/kicker.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/extensions/kasbar/kasloaditem.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/extensions/kasbar/kasloaditem.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/extensions/taskbar/taskbarextension.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/extensions/taskbar/taskbarextension.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/extensions/taskbar/taskbarextension.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/extensions/taskbar/taskbarextension.cpp
***********************************
211c211,214
<     setPaletteBackgroundPixmap(pixmap);
---
>     QBrush bgBrush(colorGroup().background(), pixmap);
>     QPalette pal = kapp->palette();
>     pal.setBrush(QColorGroup::Background, bgBrush);
>     setPalette(pal);
218a222
> 
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/share/kickertip.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/share/kickertip.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/share/kickertip.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/share/kickertip.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/applets/menu/menuapplet.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/applets/menu/menuapplet.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/applets/menu/menuapplet.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/applets/menu/menuapplet.cpp
***********************************
418c418
< 	if( ev.width > width() || ev.height > height())
---
> 	if( ev.width != width() || ev.height != height())
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/applets/systemtray/systemtrayapplet.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/applets/systemtray/systemtrayapplet.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/applets/systemtray/systemtrayapplet.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/applets/systemtray/systemtrayapplet.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kicker/applets/clock/clock.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kicker/applets/clock/clock.cpp
***********************************
1650c1650
<         bool showDate = showDate || (zone->zoneIndex() != 0);
---
>         bool mustShowDate = showDate || (zone->zoneIndex() != 0);
1652c1652
<         if (!showDate && !showDayOfWeek)
---
>         if (!mustShowDate && !showDayOfWeek)
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kpager/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kpager/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/medialist.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/medialist.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/medialist.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/medialist.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/mediamanager.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/mediamanager.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/mediamanager_skel.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/mediamanager_skel.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/mediadirnotify_skel.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/mediadirnotify_skel.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/mediadirnotify.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/mediadirnotify.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/mediadirnotify.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/mediadirnotify.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/backendbase.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/backendbase.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/backendbase.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/backendbase.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/media/kdedmodule/mediadirnotify.kidl.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/media/kdedmodule/mediadirnotify.kidl
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/ldap/kio_ldap.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/ldap/kio_ldap.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/system/kio_system.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/system/kio_system.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/fish/fish.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/fish/fish.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/remote/kdedmodule/remotedirnotify.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/remote/kdedmodule/remotedirnotify.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/remote/kdedmodule/remotedirnotify.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/remote/kdedmodule/remotedirnotify.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/remote/kdedmodule/remotedirnotify.kidl.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/remote/kdedmodule/remotedirnotify.kidl
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/remote/kdedmodule/remotedirnotifymodule.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/remote/kdedmodule/remotedirnotifymodule.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kioslave/remote/kdedmodule/remotedirnotifymodule.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kioslave/remote/kdedmodule/remotedirnotifymodule.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdeprint/kprinter/printwrapper.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdeprint/kprinter/printwrapper.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdeprint/kprinter/printwrapper.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdeprint/kprinter/printwrapper.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./nsplugins/viewer/nsplugin.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./nsplugins/viewer/nsplugin.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./nsplugins/viewer/nsplugin.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./nsplugins/viewer/nsplugin.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./nsplugins/plugin_part.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./nsplugins/plugin_part.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesktop/lock/lockdlg.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesktop/lock/lockdlg.cc
***********************************
146,147c146,149
<         if( !currentLayout.isEmpty() && layoutsList.count() > 1 )
<             setLayoutText(currentLayout);
---
>         if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) {
>             currLayout = layoutsList.find(currentLayout);
>             if (currLayout == layoutsList.end())
>                 setLayoutText("err");
148a151,152
>                 setLayoutText(*currLayout);
>         } else
165,166d168
<     QStringList::iterator it = layoutsList.find( mLayoutButton->text() );
<     if( it == layoutsList.end() ) {  // huh?
168c170,171
< 	setLayoutText( "err" );
---
>     if( ++currLayout == layoutsList.end() )
>         currLayout = layoutsList.begin();
170,174d172
<     } else {
< 
< 	if( ++it == layoutsList.end() )
< 	    it = layoutsList.begin();
< 
176c174
< 	setLayoutText( kxkb.call("setLayout", *it) ? *it : "err" );
---
>     setLayoutText( kxkb.call("setLayout", *currLayout) ? *currLayout : "err" );
179d176
< }
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesktop/lock/lockprocess.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesktop/lock/lockprocess.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesktop/kwebdesktop/kwebdesktop.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesktop/kwebdesktop/kwebdesktop.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesktop/main.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesktop/main.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesktop/kdiconview.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesktop/kdiconview.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesktop/minicli.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesktop/minicli.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/backend/xdmauth.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/backend/xdmauth.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/backend/auth.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/backend/auth.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/backend/process.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/backend/process.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/kfrontend/kdm_config.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/kfrontend/kdm_config.c
***********************************
72a73
> 	Ent *ent;
74d74
< 	int keyid;
118a119
> #define PRINT_QUOTES
516,517c517,518
< 			Debug( "now in section [%.*s], dpy '%.*s', core '%.*s'\n",
< 			       nlen, nstr, dlen, dstr, clen, cstr );
---
> 			/*Debug( "now in section [%.*s], dpy '%.*s', core '%.*s'\n",
> 			       nlen, nstr, dlen, dstr, clen, cstr );*/
574c575
< 		Debug( "read entry '%.*s'='%.*s'\n", nlen, nstr, en - st, st );
---
> 		/*Debug( "read entry '%.*s'='%.*s'\n", nlen, nstr, en - st, st );*/
586c587
< 			if (ce->id == curent->keyid) {
---
> 			if (ce == curent->ent) {
594c595
< 		curent->keyid = ce->id;
---
> 		curent->ent = ce;
614c615,618
< 				if (curent->keyid == id)
---
> 				if (curent->ent->id == id) {
> 					Debug( "line %d: %s = %'.*s\n",
> 					       curent->line, curent->ent->name,
> 					       curent->vallen, curent->val );
615a620
> 				}
627c632
< 	Section *cursec;
---
> 	Section *cursec, *bestsec;
673c678
< 					if (curent->keyid == id) {
---
> 					if (curent->ent->id == id) {
674a680
> 						bestsec = cursec;
679a686,691
> 	if (bestent)
> 		Debug( "line %d: %.*s:%.*s_%.*s/%s = %'.*s\n", bestent->line,
> 		       bestsec->dhostl, bestsec->dhost,
> 		       bestsec->dnuml, bestsec->dnum,
> 		       bestsec->dclassl, bestsec->dclass,
> 		       bestent->ent->name, bestent->vallen, bestent->val );
781a794
> 	Debug( "default: %s = %'s\n", et->name, et->def );
822c835
< /*Debug ("copying values from section [%s]\n", sec->name);*/
---
> 	Debug( "getting values for section class [%s]\n", sec->name );
995c1008
< #define PARSE_NO_ALIAS  3
---
> #define PARSE_NO_ALIAS  4
1309a1323
> 				Debug( "getting global config\n" );
1323a1338
> 				Debug( "getting config for display %s, class %s\n", disp, dcls );
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/kfrontend/kconsole.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/kfrontend/kconsole.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/kfrontend/kconsole.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/kfrontend/kconsole.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/kfrontend/kfdialog.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/kfrontend/kfdialog.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/kfrontend/kgverify.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/kfrontend/kgverify.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/kfrontend/kgapp.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/kfrontend/kgapp.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/kfrontend/kgdialog.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/kfrontend/kgdialog.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/kfrontend/genkdmconf.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/kfrontend/genkdmconf.c
***********************************
2563c2563
< 	char nname[80];
---
> 	char *nname;
2804c2804
< 	sprintf( nname, "%s/README", newdir );
---
> 	ASPrintf( &nname, "%s/README", newdir );
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdm/config.def.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdm/config.def
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/trees/history_module/history_item.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/trees/history_module/history_item.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/trees/history_module/history_settings.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/trees/history_module/history_settings.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/trees/history_module/history_module.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/trees/history_module/history_module.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/trees/history_module/history_module.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/trees/history_module/history_module.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/trees/konq_sidebartreeitem.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/trees/konq_sidebartreeitem.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/trees/konq_sidebartree.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/trees/konq_sidebartree.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/trees/konq_sidebartree.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/trees/konq_sidebartree.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/konqsidebar.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/konqsidebar.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/konqsidebariface_p.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/konqsidebariface_p.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/konqsidebar.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/konqsidebar.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/sidebar_widget.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/sidebar_widget.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/sidebar/sidebar_widget.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/sidebar/sidebar_widget.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/client/kfmclient.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/client/kfmclient.cc
***********************************
515d514
<       KFileOpenWithHandler fowh;
526,528c525,527
<       KService::Ptr serv = (*KTrader::self()->query( QString::fromLocal8Bit(args->arg(2)) ).begin());
<       if (!serv) return 1;
<       KFileOpenWithHandler fowh;
---
>       const KTrader::OfferList offers = KTrader::self()->query( QString::fromLocal8Bit( args->arg( 2 ) ), QString::fromLatin1( "Application" ), QString::null, QString::null );
>       if (offers.isEmpty()) return 1;
>       KService::Ptr serv = offers.first();
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/keditbookmarks/commands.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/keditbookmarks/commands.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/keditbookmarks/commands.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/keditbookmarks/commands.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/KonquerorIface.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/KonquerorIface.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/konq_main.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/konq_main.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konqueror/konq_mainwindow.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konqueror/konq_mainwindow.cc
***********************************
4c4
<    Copyright (C) 2000-2004 David Faure <faure@kde.org>
---
>    Copyright (C) 2000-2005 David Faure <faure@kde.org>
408a409,411
> // Detect a name filter (e.g. *.txt) in the url.
> // Note that KShortURIFilter does the same, but we have no way of getting it from there
> //
410c413
< QString KonqMainWindow::detectNameFilter( QString & url )
---
> static QString detectNameFilter( KURL & url )
411a415,417
>     if ( !KProtocolInfo::supportsListing(url) )
>         return QString::null;
> 
414,417c420,422
< 
<     int pos = url.findRev( '/' );
< 
<     if ( pos > -1 )
---
>     QString path = url.path();
>     int lastSlash = path.findRev( '/' );
>     if ( lastSlash > -1 )
419,421c424,431
<       QString lastbit = url.mid( pos + 1 );
< 
<       if ( lastbit.find( '*' ) != -1 )
---
>         if ( !url.query().isEmpty() && lastSlash == (int)path.length()-1 ) {  //  In /tmp/?foo, foo isn't a query
>             path += url.query(); // includes the '?'
>             url.setQuery( QString::null );
>         }
>         QString fileName = path.mid( lastSlash + 1 );
>         QString testPath = path.left( lastSlash + 1 );
>         if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
>              && ( !url.isLocalFile() || QFile::exists( testPath ) ) )
423,424c433,434
<         nameFilter = lastbit;
<         url = url.left( pos + 1 );
---
>             nameFilter = fileName;
>             url.setFileName( QString::null );
432c442
< void KonqMainWindow::openFilteredURL( const QString & _url, const KonqOpenURLRequest & _req)
---
> void KonqMainWindow::openFilteredURL( const QString & url, KonqOpenURLRequest & req )
434,436d443
<     QString url = _url;
<     QString nameFilter = detectNameFilter( url );
< 
442c449
<     kdDebug(1202) << "_url " << _url << " filtered into " << filteredURL.prettyURL() << endl;
---
>     kdDebug(1202) << "url " << url << " filtered into " << filteredURL.prettyURL() << endl;
447,456d453
<     if ( !nameFilter.isEmpty() )
<     {
<         if (!KProtocolInfo::supportsListing(filteredURL))
<         {
<             // Protocol doesn't support listing. Ouch. Revert to full URL, no name-filtering.
<             url = _url;
<             nameFilter = QString::null;
<             filteredURL = KonqMisc::konqFilteredURL( this, url, m_currentDir );
<         }
<     }
459,460d455
<     KonqOpenURLRequest req( _req  );
<     req.nameFilter = nameFilter;
504a500,506
>   QString nameFilter = detectNameFilter( url );
>   if ( !nameFilter.isEmpty() )
>   {
>     req.nameFilter = nameFilter;
>     url.setFileName( QString::null );
>   }
> 
1600c1602
<     QString locURL( locationBarURL );
---
>     KURL locURL = KURL::fromPathOrURL( locationBarURL );
1604c1606
<     m_currentView->openURL( KURL( locURL ), locationBarURL, nameFilter );
---
>     m_currentView->openURL( locURL, locationBarURL, nameFilter );
3853c3855
<   KAction *goUrl = new KonqGoURLAction( i18n( "Go" ), "key_enter", 0, this, SLOT( goURL() ), actionCollection(), "go_url" );
---
>   KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, this, SLOT( goURL() ), actionCollection(), "go_url" );
4187a4190,4191
>           // TODO how to re-set the original action text, when switching to a part that didn't call setAction?
>           // Can't test with Paste...
4923c4927
<           kdDebug(1202) << " Creating action for " << library << ". Default service " << itname << endl;
---
>           //kdDebug(1202) << " Creating action for " << library << ". Default service " << itname << endl;
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksplashml/kcmksplash/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksplashml/kcmksplash/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksplashml/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksplashml/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kxkb/rules.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kxkb/rules.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kxkb/kcmmisc.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kxkb/kcmmisc.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./libkonq/favicons/favicons.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./libkonq/favicons/favicons.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./libkonq/favicons/favicons.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./libkonq/favicons/favicons.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./libkonq/konq_undo.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./libkonq/konq_undo.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./libkonq/konq_undo.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./libkonq/konq_undo.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./libkonq/konqbookmarkmanager.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./libkonq/konqbookmarkmanager.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./libkonq/konq_iconviewwidget.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./libkonq/konq_iconviewwidget.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./libkonq/konqbookmarkmanager.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./libkonq/konqbookmarkmanager.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./khotkeys/shared/conditions.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./khotkeys/shared/conditions.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./khotkeys/kcontrol/tab_widget.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./khotkeys/kcontrol/tab_widget.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./khotkeys/kcontrol/kcmkhotkeys.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./khotkeys/kcontrol/kcmkhotkeys.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ktip/ktipwindow.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ktip/ktipwindow.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/clients/keramik/embedtool.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/clients/keramik/embedtool.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/clients/plastik/plastikbutton.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/clients/plastik/plastikbutton.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/lib/kdecoration_p.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/lib/kdecoration_p.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/lib/kdecoration_plugins_p.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/lib/kdecoration_plugins_p.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/lib/kdecoration.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/lib/kdecoration.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/lib/kdecorationfactory.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/lib/kdecorationfactory.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/main.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/main.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/options.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/options.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/options.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/options.cpp
***********************************
34,35c34
<     :   KDecorationOptions(),
<         electric_borders( 0 ),
---
>     :   electric_borders( 0 ),
38c37
<     d = new KDecorationOptionsPrivate();
---
>     d = new KDecorationOptionsPrivate;
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/atoms.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/atoms.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/atoms.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/atoms.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/KWinInterface.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/KWinInterface.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/utils.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/utils.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/client.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/client.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/utils.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/utils.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kwin/client.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kwin/client.cpp
***********************************
1572,1573c1572
<     return ( isNormalWindow() || isDialog() || isOverride())
<         && wantsInput() && !skip_taskbar;
---
>     return ( isNormalWindow() || isDialog() || isOverride()) && wantsInput();
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/tests/esc.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/tests/esc.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/tests/header.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/tests/header.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/TEWidget.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/TEWidget.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/kwrited.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/kwrited.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/main.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/konsole.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/konsole.h
***********************************
45c45
< #define VERSION "1.5.1"
---
> #define VERSION "1.5.2"
85a86
>   void setSessionEncoding(const QString&, TESession* = 0);
291a293
>   QString        s_encodingName;
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/konsole_part.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/konsole_part.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/session.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/session.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/konsole.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/konsole.cpp
***********************************
407c407
<    if (!showMenubar->isChecked())
---
>    if (!showMenubar->isChecked() && m_options)
824a825
>    if (m_options) {
848a850
> }
1324c1326
<   m_tabbarPopupMenu->popup( pos );
---
>   if ( m_tabbarPopupMenu ) m_tabbarPopupMenu->popup( pos );
1470a1473
>     config->writeEntry("EncodingName", se->encoding());
1595a1599,1600
> 
>       s_encodingName = config->readEntry( "EncodingName", "" ).lower();
1615a1621
>       selectSetEncoding->setCurrentItem( se->encodingNo() );
2139a2146,2148
> 
>   if (m_tabViewMode == ShowIconOnly)
>     tabwidget->changeTab( se->widget(), QString::null );
2512c2521
<       selectBell->setCurrentItem(te->bellMode());
---
>       if (selectBell) selectBell->setCurrentItem(te->bellMode());
2541c2550
<   selectSetEncoding->setCurrentItem(se->encodingNo());
---
>   if (selectSetEncoding) selectSetEncoding->setCurrentItem(se->encodingNo());
2543,2546c2552,2555
<   m_clearHistory->setEnabled( se->history().isOn() );
<   m_findHistory->setEnabled( se->history().isOn() );
<   m_findNext->setEnabled( se->history().isOn() );
<   m_findPrevious->setEnabled( se->history().isOn() );
---
>   if (m_clearHistory) m_clearHistory->setEnabled( se->history().isOn() );
>   if (m_findHistory) m_findHistory->setEnabled( se->history().isOn() );
>   if (m_findNext) m_findNext->setEnabled( se->history().isOn() );
>   if (m_findPrevious) m_findPrevious->setEnabled( se->history().isOn() );
2548,2550c2557,2559
<   m_saveHistory->setEnabled( se->history().isOn() );
<   monitorActivity->setChecked( se->isMonitorActivity() );
<   monitorSilence->setChecked( se->isMonitorSilence() );
---
>   if (m_saveHistory) m_saveHistory->setEnabled( se->history().isOn() );
>   if (monitorActivity) monitorActivity->setChecked( se->isMonitorActivity() );
>   if (monitorSilence) monitorSilence->setChecked( se->isMonitorSilence() );
2554,2555c2563,2564
<   m_moveSessionLeft->setEnabled(position>0);
<   m_moveSessionRight->setEnabled(position<sessions.count()-1);
---
>   if (m_moveSessionLeft) m_moveSessionLeft->setEnabled(position>0);
>   if (m_moveSessionRight) m_moveSessionRight->setEnabled(position<sessions.count()-1);
2572a2582,2629
> // Set session encoding; don't use any menu items.
> // System's encoding list may change, so search for encoding string.
> // FIXME: A lot of duplicate code from slotSetSessionEncoding
> void Konsole::setSessionEncoding( const QString &encoding, TESession *session )
> {
>     if ( encoding.isEmpty() )
>         return;
> 
>     if ( !session )
>         session = se;
> 
>     // availableEncodingNames and descriptEncodingNames are NOT returned
>     // in the same order.
>     QStringList items = KGlobal::charsets()->descriptiveEncodingNames();
>     QString enc;
> 
>     // For purposes of using 'find' add a space after name,
>     // otherwise 'iso 8859-1' will find 'iso 8859-13'
>     QString t_enc = encoding + " ";
>     unsigned int i = 0;
> 
>     for( QStringList::ConstIterator it = items.begin(); it != items.end(); 
>          ++it, ++i)
>     {
>         if ( (*it).find( t_enc ) != -1 )
>         {
>             enc = *it;
>             break;
>         }
>     }
>     if (i >= items.count())
>         return;
> 
>     bool found = false;
>     enc = KGlobal::charsets()->encodingForName(enc);
>     QTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
> 
>     //kdDebug()<<"setSessionEncoding="<<enc<<"; "<<i<<"; found="<<found<<endl;
>     if ( !found )
>         return;
> 
>     session->setEncodingNo( i + 1 );    // Take into account Default
>     session->getEmulation()->setCodec(qtc);
>     if (se == session)
>         activateSession(se);
> 
> }
> 
2576a2634,2637
> 
>   if ( !selectSetEncoding )         // when action/settings=false
>     return;
> 
2599c2660
<   session->setEncodingNo(i);
---
>   session->setEncodingNo( i + 1 );    // Take into account Default
2677a2739,2752
>   if (i == SESSION_NEW_WINDOW_ID)
>   {
>     // TODO: "type" isn't passed properly
>     Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis,
>                                    n_scroll != TEWidget::SCRNONE, 0, false, 0);
>     konsole->newSession();
>     konsole->enableFullScripting(b_fullScripting);
>     konsole->enableFixedSize(b_fixedSize);
>     konsole->setColLin(0,0); // Use defaults
>     konsole->initFullScreen();
>     konsole->show();
>     return;
>   }
> 
2838a2914,2915
>   setSessionEncoding( s_encodingName, s );
> 
3473a3551
>   if ( selectSetEncoding ) {
3476a3555
> }
3918c3997
<   int query = KMessageBox::Yes;
---
>   int query = KMessageBox::Continue;
3923c4002
<     query = KMessageBox::warningYesNoCancel( this,
---
>     query = KMessageBox::warningContinueCancel( this,
3926c4005
<   if (query==KMessageBox::Yes) {
---
>   if (query==KMessageBox::Continue) {
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/session.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/session.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/default.keytab.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/default.keytab.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/keytrans.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/keytrans.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/sessioniface.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/sessioniface.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./konsole/konsole/konsoleiface.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./konsole/konsole/konsoleiface.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesu/kdesud/secure.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesu/kdesud/secure.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesu/kdesud/secure.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesu/kdesud/secure.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesu/kdesud/handler.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesu/kdesud/handler.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./kdesu/kdesu/kdesu.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./kdesu/kdesu/kdesu.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/ksysguardd/Solaris/Memory.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/ksysguardd/Solaris/Memory.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/ksysguardd/Solaris/Memory.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/ksysguardd/Solaris/Memory.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/ksysguardd/Solaris/LoadAvg.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/ksysguardd/Solaris/LoadAvg.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/ksysguardd/Solaris/NetDev.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/ksysguardd/Solaris/NetDev.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/ksysguardd/Solaris/ProcessList.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/ksysguardd/Solaris/ProcessList.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/ksysguardd/modules.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/ksysguardd/modules.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/ksysguardd/conf.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/ksysguardd/conf.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/ksysguardd/ksysguardd.c.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/ksysguardd/ksysguardd.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/gui/ksgrd/SensorAgent.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/gui/ksgrd/SensorAgent.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/gui/ksgrd/SensorManager.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/gui/ksgrd/SensorManager.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/gui/SystemLoad.sgrd.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/gui/SystemLoad.sgrd
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/gui/ProcessTable.sgrd.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/gui/ProcessTable.sgrd
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/gui/ksysguard.cc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/gui/ksysguard.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/gui/ksysguard.h.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/gui/ksysguard.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksysguard/example/ksysguarddrc.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksysguard/example/ksysguarddrc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdebase-3.4.1/./ksystraycmd/main.cpp.kde.orig /src/steleman/kde-3.4.2/kdebase-3.4.2/./ksystraycmd/main.cpp
***********************************
***********************************
