Hello community,
here is the log from the commit of package kdebase3
checked in at Tue Apr 25 21:54:37 CEST 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-04-24 13:26:23.000000000 +0200
+++ STABLE/kdebase3/kdebase3.changes 2006-04-25 19:22:47.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 25 19:22:06 CEST 2006 - wstephenson@suse.de
+
+- Use a user writable directory for user indexing (#165308)
+
+-------------------------------------------------------------------
New:
----
khelpcenter-localindices.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:08.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:08.000000000 +0200
@@ -37,7 +37,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.1
-Release: 63
+Release: 65
%define kde_version 3.5.1
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -160,6 +160,7 @@
Patch157: kcmsamba_log.diff
Patch158: kcm_kio-no-error.diff
Patch159: pluginscan-libXt.diff
+Patch160: khelpcenter-localindices.patch
Provides: kdebase
%description
@@ -329,7 +330,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 78
+Release: 80
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -478,6 +479,7 @@
%patch157
%patch158
%patch159
+%patch160
cp %SOURCE17 l10n/tw/flag.png
. /etc/opt/kde3/common_options
cd ../fileshareset2
@@ -1398,6 +1400,8 @@
%endif
%changelog -n kdebase3
+* Tue Apr 25 2006 - wstephenson@suse.de
+- Use a user writable directory for user indexing (#165308)
* Mon Apr 24 2006 - stbinner@suse.de
- pull libXt into plugin scan to find all NS plugins (#140485)
* Fri Apr 21 2006 - stbinner@suse.de
++++++ 04_startup_phases_kdebase.patch ++++++
++++ 753 lines (skipped)
++++ between KDE/kdebase3/04_startup_phases_kdebase.patch
++++ and STABLE/kdebase3/04_startup_phases_kdebase.patch
++++++ 07_09_wallpaper_opts.patch ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:08.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:08.000000000 +0200
@@ -1,7 +1,6 @@
-diff -u -p -d -N -r kdebase.sav/kcontrol/background/bgdialog.cpp kdebase/kcontrol/background/bgdialog.cpp
---- kdebase.sav/kcontrol/background/bgdialog.cpp 2005-09-29 21:33:43.000000000 +0200
-+++ kdebase/kcontrol/background/bgdialog.cpp 2005-11-24 18:22:08.000000000 +0100
-@@ -835,14 +835,16 @@ void BGDialog::slotPreviewDone(int desk_
+--- kdebase-3.5.1/kcontrol/background/bgdialog.cpp
++++ kdebase-3.5.1/kcontrol/background/bgdialog.cpp
+@@ -835,14 +835,16 @@
KBackgroundRenderer * r = m_renderer[m_eDesk][(m_eScreen>1) ? (screen_done+2) : m_eScreen];
@@ -21,9 +20,8 @@
if ( m_eScreen == 0 )
{
-diff -u -p -d -N -r kdebase.sav/kcontrol/background/bgrender.cpp kdebase/kcontrol/background/bgrender.cpp
---- kdebase.sav/kcontrol/background/bgrender.cpp 2005-11-16 14:03:03.000000000 +0100
-+++ kdebase/kcontrol/background/bgrender.cpp 2005-11-24 18:22:08.000000000 +0100
+--- kdebase-3.5.1/kcontrol/background/bgrender.cpp
++++ kdebase-3.5.1/kcontrol/background/bgrender.cpp
@@ -12,11 +12,13 @@
#include
@@ -39,7 +37,7 @@
#include
#include
-@@ -52,10 +54,11 @@ KBackgroundRenderer::KBackgroundRenderer
+@@ -52,10 +54,11 @@
m_pDirs = KGlobal::dirs();
m_rSize = m_Size = drawBackgroundPerScreen ?
QApplication::desktop()->screenGeometry(screen).size() : QApplication::desktop()->size();
@@ -52,7 +50,7 @@
m_pTimer = new QTimer(this);
connect(m_pTimer, SIGNAL(timeout()), SLOT(render()));
-@@ -88,18 +91,18 @@ void KBackgroundRenderer::desktopResized
+@@ -88,18 +91,18 @@
}
@@ -75,7 +73,7 @@
}
-@@ -194,8 +197,8 @@ int KBackgroundRenderer::doBackground(bo
+@@ -194,8 +197,8 @@
case Flat:
// this can be tiled correctly without problems
@@ -86,7 +84,7 @@
break;
case Pattern:
-@@ -206,17 +209,17 @@ int KBackgroundRenderer::doBackground(bo
+@@ -206,17 +209,17 @@
if (file.isEmpty())
break;
@@ -110,7 +108,7 @@
break;
}
case Program:
-@@ -242,9 +245,9 @@ int KBackgroundRenderer::doBackground(bo
+@@ -242,9 +245,9 @@
{
QSize size = m_Size;
// on <16bpp displays the gradient sucks when tiled because of dithering
@@ -122,7 +120,7 @@
KImageEffect::HorizontalGradient, 0);
break;
}
-@@ -252,24 +255,24 @@ int KBackgroundRenderer::doBackground(bo
+@@ -252,24 +255,24 @@
{
QSize size = m_Size;
// on <16bpp displays the gradient sucks when tiled because of dithering
@@ -152,7 +150,7 @@
KImageEffect::EllipticGradient, 0);
break;
}
-@@ -292,7 +295,7 @@ int KBackgroundRenderer::doWallpaper(boo
+@@ -292,7 +295,7 @@
int wpmode= enabled()?wallpaperMode():NoWallpaper;
@@ -161,7 +159,7 @@
if (wpmode != NoWallpaper) {
wp_load:
if (currentWallpaper().isEmpty()) {
-@@ -356,7 +359,7 @@ wp_load:
+@@ -356,7 +359,7 @@
}
if (svgEngine->load(svgWidth, svgHeight, file )) {
@@ -170,7 +168,7 @@
} else {
kdWarning() << "failed to load SVG file " << file << endl;
}
-@@ -367,33 +370,34 @@ wp_load:
+@@ -367,33 +370,34 @@
<< "tried to load SVG file but libart not installed" << endl;
#endif
} else {
@@ -214,7 +212,7 @@
}
int retval = Done;
-@@ -401,31 +405,34 @@ wp_out:
+@@ -401,31 +405,34 @@
int w = m_Size.width(); // desktop width/height
int h = m_Size.height();
@@ -258,7 +256,7 @@
break;
}
// fall through
-@@ -440,8 +447,9 @@ wp_out:
+@@ -440,8 +447,9 @@
wh = (int)(sx * wh);
ww = w;
}
@@ -270,7 +268,7 @@
break;
}
case TiledMaxpect:
-@@ -455,8 +463,9 @@ wp_out:
+@@ -455,8 +463,9 @@
wh = (int)(sx * wh);
ww = w;
}
@@ -282,7 +280,7 @@
break;
}
case ScaleAndCrop:
-@@ -472,13 +481,14 @@ wp_out:
+@@ -472,13 +481,14 @@
wh = h;
ww = (int)(sy*ww);
}
@@ -300,7 +298,7 @@
if (retval == Done)
m_State |= WallpaperDone;
-@@ -486,94 +496,107 @@ wp_out:
+@@ -486,94 +496,107 @@
return retval;
}
@@ -443,7 +441,7 @@
QPoint(-QMIN(x, 0), -QMIN(y, 0)), blendFactor);
}
}
-@@ -586,52 +609,52 @@ void KBackgroundRenderer::fullWallpaperB
+@@ -586,52 +609,52 @@
switch( blendMode() ) {
case HorizontalBlending:
@@ -505,7 +503,7 @@
KImageEffect::HueShift, bal, KImageEffect::Gray );
break;
-@@ -646,18 +669,18 @@ void KBackgroundRenderer::fullWallpaperB
+@@ -646,18 +669,18 @@
* Default offset is QPoint(0, 0).
* blendfactor = [0, 100%]
*/
@@ -529,7 +527,7 @@
+ (soffs.x() + x) * sizeof(QRgb));
a = (qAlpha(*d) * blendFactor) / 100;
*b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8),
-@@ -676,7 +699,7 @@ void KBackgroundRenderer::slotBackground
+@@ -676,7 +699,7 @@
m_State |= BackgroundDone;
if (m_pProc->normalExit() && !m_pProc->exitStatus()) {
@@ -538,7 +536,7 @@
m_State |= BackgroundDone;
}
-@@ -695,12 +718,8 @@ void KBackgroundRenderer::start(bool ena
+@@ -695,12 +718,8 @@
{
m_enableBusyCursor = enableBusyCursor;
setBusyCursor(true);
@@ -553,7 +551,7 @@
m_State = Rendering;
m_pTimer->start(0, true);
-@@ -717,6 +736,29 @@ void KBackgroundRenderer::render()
+@@ -717,6 +736,29 @@
if (!(m_State & Rendering))
return;
@@ -583,7 +581,7 @@
int ret;
if (!(m_State & BackgroundDone)) {
-@@ -792,11 +834,14 @@ void KBackgroundRenderer::stop()
+@@ -792,11 +834,14 @@
void KBackgroundRenderer::cleanup()
{
setBusyCursor(false);
@@ -601,7 +599,7 @@
}
-@@ -811,30 +856,24 @@ void KBackgroundRenderer::setPreview(con
+@@ -811,30 +856,24 @@
}
@@ -642,7 +640,7 @@
}
-@@ -856,7 +895,59 @@ void KBackgroundRenderer::createTempFile
+@@ -856,7 +895,59 @@
m_Tempfile = new KTempFile();
}
@@ -702,7 +700,7 @@
//BEGIN class KVirtualBGRenderer
KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
-@@ -916,12 +1007,12 @@ KBackgroundRenderer * KVirtualBGRenderer
+@@ -916,12 +1007,12 @@
}
@@ -717,7 +715,7 @@
}
-@@ -1124,18 +1215,18 @@ void KVirtualBGRenderer::screenDone(int
+@@ -1123,18 +1214,18 @@
drawPos.setX( int(drawPos.x() * m_scaleX) );
drawPos.setY( int(drawPos.y() * m_scaleY) );
@@ -740,7 +738,7 @@
p.end();
}
-@@ -1187,6 +1278,19 @@ void KVirtualBGRenderer::cleanup()
+@@ -1186,6 +1277,19 @@
delete m_pPixmap;
m_pPixmap = 0l;
}
@@ -760,9 +758,8 @@
//END class KVirtualBGRenderer
-diff -u -p -d -N -r kdebase.sav/kcontrol/background/bgrender.h kdebase/kcontrol/background/bgrender.h
---- kdebase.sav/kcontrol/background/bgrender.h 2005-09-06 09:27:12.000000000 +0200
-+++ kdebase/kcontrol/background/bgrender.h 2005-11-24 18:22:08.000000000 +0100
+--- kdebase-3.5.1/kcontrol/background/bgrender.h
++++ kdebase-3.5.1/kcontrol/background/bgrender.h
@@ -13,14 +13,14 @@
#include
@@ -780,7 +777,7 @@
class QTimer;
class KConfig;
-@@ -50,10 +50,12 @@ public:
+@@ -50,10 +50,12 @@
void setPreview(const QSize &size);
void setSize(const QSize &size);
@@ -795,7 +792,7 @@
public slots:
void start(bool enableBusyCursor = false);
-@@ -72,32 +74,38 @@ private slots:
+@@ -72,32 +74,38 @@
private:
enum { Error, Wait, WaitUpdate, Done };
@@ -844,7 +841,7 @@
QTimer *m_pTimer;
KStandardDirs *m_pDirs;
-@@ -121,7 +129,7 @@ public:
+@@ -121,7 +129,7 @@
KBackgroundRenderer * renderer(unsigned screen);
unsigned numRenderers() const { return m_numRenderers; }
@@ -853,7 +850,7 @@
void setPreview(const QSize & size);
-@@ -140,6 +148,8 @@ public:
+@@ -140,6 +148,8 @@
void start();
void stop();
void cleanup();
@@ -862,10 +859,9 @@
signals:
void imageDone(int desk);
-diff -u -p -d -N -r kdebase.sav/kcontrol/kicker/positiontab_impl.cpp kdebase/kcontrol/kicker/positiontab_impl.cpp
---- kdebase.sav/kcontrol/kicker/positiontab_impl.cpp 2005-09-06 09:27:18.000000000 +0200
-+++ kdebase/kcontrol/kicker/positiontab_impl.cpp 2005-11-24 18:22:14.000000000 +0100
-@@ -487,7 +487,7 @@ void PositionTab::panelDimensionsChanged
+--- kdebase-3.5.1/kcontrol/kicker/positiontab_impl.cpp
++++ kdebase-3.5.1/kcontrol/kicker/positiontab_impl.cpp
+@@ -487,7 +487,7 @@
void PositionTab::slotBGPreviewReady(int)
{
@@ -874,10 +870,9 @@
#if 0
KPixmap pm;
if (QPixmap::defaultDepth() < 15)
-diff -u -p -d -N -r kdebase.sav/kdesktop/bgmanager.cc kdebase/kdesktop/bgmanager.cc
---- kdebase.sav/kdesktop/bgmanager.cc 2005-09-06 09:27:35.000000000 +0200
-+++ kdebase/kdesktop/bgmanager.cc 2005-11-24 18:22:28.000000000 +0100
-@@ -82,6 +82,7 @@ KBackgroundManager::KBackgroundManager(Q
+--- kdebase-3.5.1/kdesktop/bgmanager.cc
++++ kdebase-3.5.1/kdesktop/bgmanager.cc
+@@ -82,6 +82,7 @@
m_Cache[i]->exp_from = -1;
m_Renderer.insert (i, new KVirtualBGRenderer(i,m_pConfig));
connect(m_Renderer[i], SIGNAL(imageDone(int)), SLOT(slotImageDone(int)));
@@ -885,7 +880,7 @@
}
configure();
-@@ -262,6 +263,7 @@ void KBackgroundManager::slotChangeNumbe
+@@ -265,6 +266,7 @@
m_Cache[i]->exp_from = -1;
m_Renderer.insert(i, new KVirtualBGRenderer(i,m_pConfig));
connect(m_Renderer[i], SIGNAL(imageDone(int)), SLOT(slotImageDone(int)));
@@ -893,7 +888,7 @@
}
}
}
-@@ -404,10 +406,9 @@ void KBackgroundManager::slotImageDone(i
+@@ -407,10 +409,9 @@
{
KPixmap *pm = new KPixmap();
KVirtualBGRenderer *r = m_Renderer[desk];
@@ -906,7 +901,7 @@
// If current: paint it
bool current = (r->hash() == m_Renderer[effectiveDesktop()]->hash());
if (current)
-@@ -417,6 +418,8 @@ void KBackgroundManager::slotImageDone(i
+@@ -420,6 +421,8 @@
{
m_bBgInitDone = true;
emit initDone();
@@ -915,7 +910,7 @@
}
}
if (m_bExport || !m_bCommon)
-@@ -426,9 +429,24 @@ void KBackgroundManager::slotImageDone(i
+@@ -429,9 +432,24 @@
if (current)
exportBackground(desk, realDesktop());
@@ -940,10 +935,9 @@
/*
* Size in bytes of a QPixmap. For use in the pixmap cache.
*/
-diff -u -p -d -N -r kdebase.sav/kdesktop/bgmanager.h kdebase/kdesktop/bgmanager.h
---- kdebase.sav/kdesktop/bgmanager.h 2005-09-06 09:27:35.000000000 +0200
-+++ kdebase/kdesktop/bgmanager.h 2005-11-24 18:22:28.000000000 +0100
-@@ -82,6 +82,7 @@ private slots:
+--- kdebase-3.5.1/kdesktop/bgmanager.h
++++ kdebase-3.5.1/kdesktop/bgmanager.h
+@@ -82,6 +82,7 @@
void repaintBackground();
void desktopResized();
void clearRoot();
@@ -951,10 +945,9 @@
private:
void applyCommon(bool common);
-diff -u -p -d -N -r kdebase.sav/kdm/kfrontend/krootimage.cpp kdebase/kdm/kfrontend/krootimage.cpp
---- kdebase.sav/kdm/kfrontend/krootimage.cpp 2005-09-29 21:34:33.000000000 +0200
-+++ kdebase/kdm/kfrontend/krootimage.cpp 2005-11-24 18:22:42.000000000 +0100
-@@ -50,6 +50,7 @@ MyApplication::MyApplication( const char
+--- kdebase-3.5.1/kdm/kfrontend/krootimage.cpp
++++ kdebase-3.5.1/kdm/kfrontend/krootimage.cpp
+@@ -50,6 +50,7 @@
{
connect( &timer, SIGNAL(timeout()), SLOT(slotTimeout()) );
connect( &renderer, SIGNAL(imageDone( int )), this, SLOT(renderDone()) );
@@ -962,7 +955,7 @@
timer.start( 60000 );
renderer.start();
}
-@@ -58,8 +59,10 @@ MyApplication::MyApplication( const char
+@@ -58,8 +59,10 @@
void
MyApplication::renderDone()
{
++++++ 08_wallpaper_less_flicker.patch ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:08.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:08.000000000 +0200
@@ -1,6 +1,18 @@
---- kdesktop/desktop.cc.sav 2005-11-08 13:38:50.000000000 +0100
-+++ kdesktop/desktop.cc 2005-11-10 15:54:44.000000000 +0100
-@@ -347,9 +347,6 @@ void
+--- kdesktop/bgmanager.cc
++++ kdesktop/bgmanager.cc
+@@ -357,6 +357,9 @@
+ { // clear the root window pixmap set by kdm
+ root_cleared = true;
+ QTimer::singleShot( 0, this, SLOT( clearRoot()));
++ // but make the pixmap visible until m_pDesktop is visible
++ QApplication::desktop()->screen()->setErasePixmap(*pm);
++ QApplication::desktop()->screen()->erase();
+ }
+ }
+ else
+--- kdesktop/desktop.cc
++++ kdesktop/desktop.cc
+@@ -350,9 +350,6 @@
KDesktop::backgroundInitDone()
{
//kdDebug(1204) << "KDesktop::backgroundInitDone" << endl;
@@ -10,7 +22,7 @@
// avoid flicker
if (m_bDesktopEnabled)
{
-@@ -358,7 +355,11 @@ KDesktop::backgroundInitDone()
+@@ -361,7 +358,11 @@
m_pIconView->setErasePixmap( *bg );
show();
@@ -22,15 +34,3 @@
}
void
---- kdesktop/bgmanager.cc.sav 2005-09-06 09:27:35.000000000 +0200
-+++ kdesktop/bgmanager.cc 2005-11-10 15:59:25.000000000 +0100
-@@ -352,6 +352,9 @@ void KBackgroundManager::setPixmap(KPixm
- { // clear the root window pixmap set by kdm
- root_cleared = true;
- QTimer::singleShot( 0, this, SLOT( clearRoot()));
-+ // but make the pixmap visible until m_pDesktop is visible
-+ QApplication::desktop()->screen()->setErasePixmap(*pm);
-+ QApplication::desktop()->screen()->erase();
- }
- }
- else
++++++ 3_5_BRANCH.diff ++++++
++++ 5261 lines (skipped)
++++ between KDE/kdebase3/3_5_BRANCH.diff
++++ and STABLE/kdebase3/3_5_BRANCH.diff
++++++ 3_5_BRANCH_fix-kded-hang-with-nfs.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,14 +1,6 @@
-------------------------------------------------------------------------
-r521680 | mueller | 2006-03-23 10:19:38 +0100 (Thu, 23 Mar 2006) | 2 lines
-
-backport -r521679
-
-------------------------------------------------------------------------
-Index: kioslave/media/mediamanager/fstabbackend.cpp
-===================================================================
---- kioslave/media/mediamanager/fstabbackend.cpp (revision 521679)
-+++ kioslave/media/mediamanager/fstabbackend.cpp (revision 521680)
-@@ -144,7 +144,7 @@ bool inExclusionPattern(KMountPoint *mou
+--- kioslave/media/mediamanager/fstabbackend.cpp
++++ kioslave/media/mediamanager/fstabbackend.cpp
+@@ -144,7 +144,7 @@
void FstabBackend::handleMtabChange(bool allowNotification)
{
@@ -17,7 +9,7 @@
KMountPoint::List mtab = KMountPoint::currentMountPoints();
KMountPoint::List::iterator it = mtab.begin();
-@@ -158,6 +158,14 @@ void FstabBackend::handleMtabChange(bool
+@@ -158,6 +158,14 @@
if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue;
@@ -32,7 +24,7 @@
QString id = generateId(dev, mp);
new_mtabIds+=id;
-@@ -218,6 +226,7 @@ void FstabBackend::handleMtabChange(bool
+@@ -218,6 +226,7 @@
}
m_mtabIds = new_mtabIds;
@@ -40,11 +32,9 @@
}
void FstabBackend::handleFstabChange(bool allowNotification)
-Index: kioslave/media/mediamanager/fstabbackend.h
-===================================================================
---- kioslave/media/mediamanager/fstabbackend.h (revision 521679)
-+++ kioslave/media/mediamanager/fstabbackend.h (revision 521680)
-@@ -53,6 +53,7 @@ private:
+--- kioslave/media/mediamanager/fstabbackend.h
++++ kioslave/media/mediamanager/fstabbackend.h
+@@ -53,6 +53,7 @@
bool m_networkSharesOnly;
QStringList m_mtabIds;
++++++ 3_5_BRANCH_kicker_147941.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,6 +1,6 @@
---- kicker/kicker/core/containerarealayout.cpp.sav 2005-11-30 16:53:23.000000000 +0100
-+++ kicker/kicker/core/containerarealayout.cpp 2006-02-03 15:38:46.000000000 +0100
-@@ -635,6 +635,25 @@ void ContainerAreaLayout::moveContainerS
+--- kicker/kicker/core/containerarealayout.cpp
++++ kicker/kicker/core/containerarealayout.cpp
+@@ -635,6 +635,25 @@
geom.moveLeft(distance);
moving->setGeometryR(geom);
++++++ 3_5_BRANCH_kicker_155339.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,8 +1,8 @@
Index: kdebase-3.5.1/kicker/applets/systemtray/systemtrayapplet.cpp
-===================================================================
---- kdebase-3.5.1.orig/kicker/applets/systemtray/systemtrayapplet.cpp
+================================================================================
+--- kdebase-3.5.1/kicker/applets/systemtray/systemtrayapplet.cpp
+++ kdebase-3.5.1/kicker/applets/systemtray/systemtrayapplet.cpp
-@@ -831,6 +831,7 @@ void SystemTrayApplet::layoutTray()
+@@ -831,6 +831,7 @@
if (iconCount == 0)
{
@@ -10,11 +10,9 @@
return;
}
-Index: kdebase-3.5.1/kicker/kicker/core/kicker.cpp
-===================================================================
---- kdebase-3.5.1.orig/kicker/kicker/core/kicker.cpp
+--- kdebase-3.5.1/kicker/kicker/core/kicker.cpp
+++ kdebase-3.5.1/kicker/kicker/core/kicker.cpp
-@@ -155,7 +155,9 @@ Kicker::Kicker()
+@@ -137,7 +137,9 @@
Kicker::~Kicker()
{
@@ -24,11 +22,9 @@
}
void Kicker::setCrashHandler()
-Index: kdebase-3.5.1/kicker/kicker/core/menumanager.cpp
-===================================================================
---- kdebase-3.5.1.orig/kicker/kicker/core/menumanager.cpp
+--- kdebase-3.5.1/kicker/kicker/core/menumanager.cpp
+++ kdebase-3.5.1/kicker/kicker/core/menumanager.cpp
-@@ -53,7 +53,7 @@ MenuManager* MenuManager::the()
+@@ -53,7 +53,7 @@
{
if (!m_self)
{
@@ -37,7 +33,7 @@
}
return m_self;
-@@ -70,6 +70,11 @@ MenuManager::MenuManager(QObject *parent
+@@ -70,6 +70,11 @@
MenuManager::~MenuManager()
{
@@ -49,11 +45,9 @@
delete m_kmenu;
}
-Index: kdebase-3.5.1/kicker/kicker/core/menumanager.h
-===================================================================
---- kdebase-3.5.1.orig/kicker/kicker/core/menumanager.h
+--- kdebase-3.5.1/kicker/kicker/core/menumanager.h
+++ kdebase-3.5.1/kicker/kicker/core/menumanager.h
-@@ -57,6 +57,7 @@ public:
+@@ -57,6 +57,7 @@
void registerKButton(PanelPopupButton *button);
void unregisterKButton(PanelPopupButton *button);
PanelPopupButton* findKButtonFor(QPopupMenu* menu);
@@ -61,7 +55,7 @@
public slots:
void slotSetKMenuItemActive();
-@@ -72,7 +73,6 @@ protected:
+@@ -72,7 +73,6 @@
private:
MenuManager(QObject *parent = 0);
++++++ access.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,7 +1,7 @@
Index: kcontrol/access/kaccess.cpp
-===================================================================
---- kcontrol/access/kaccess.cpp (Revision 470175)
-+++ kcontrol/access/kaccess.cpp (Arbeitskopie)
+================================================================================
+--- kcontrol/access/kaccess.cpp
++++ kcontrol/access/kaccess.cpp
@@ -263,7 +263,7 @@
else
xkb->ctrls->ax_options &= ~(XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
++++++ artwork.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,15 +1,16 @@
--- kioslave/fish/fish.protocol
-+++ kioslave/fish/fish.protocol 2004/12/07 10:13:45
-@@ -10,6 +10,6 @@
++++ kioslave/fish/fish.protocol
+@@ -10,7 +10,7 @@
deleting=true
linking=true
moving=true
-Icon=remote
+Icon=folder_html
Description=A kioslave for the FISH protocol
- DocPath=kioslave/fish.html
+ Description[af]='n Kioslave vir die FISH protokol
+ Description[bn]=ফিশ (FISH) প্রোটোকল-এর জন্য একটি kioslave
--- kioslave/floppy/floppy.protocol
-+++ kioslave/floppy/floppy.protocol 2004/12/07 10:13:45
++++ kioslave/floppy/floppy.protocol
@@ -9,6 +9,6 @@
makedir=true
deleting=true
@@ -19,7 +20,7 @@
DocPath=kioslave/floppy.html
Class=:local
--- kioslave/nfs/nfs.protocol
-+++ kioslave/nfs/nfs.protocol 2004/12/07 10:13:45
++++ kioslave/nfs/nfs.protocol
@@ -11,4 +11,4 @@
linking=true
moving=true
++++++ autorun.patch ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,7 +1,7 @@
Index: kioslave/media/medianotifier/medianotifier.cpp
-===================================================================
---- kioslave/media/medianotifier/medianotifier.cpp (Revision 502639)
-+++ kioslave/media/medianotifier/medianotifier.cpp (Arbeitskopie)
+================================================================================
+--- kioslave/media/medianotifier/medianotifier.cpp
++++ kioslave/media/medianotifier/medianotifier.cpp
@@ -125,7 +125,7 @@
// be checked for the following Autostart files in order of precedence:
// .autorun, autorun, autorun.sh
++++++ background_default.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,7 +1,7 @@
Index: kcontrol/background/bgwallpaper.cpp
-===================================================================
---- kcontrol/background/bgwallpaper.cpp (Revision 490055)
-+++ kcontrol/background/bgwallpaper.cpp (Arbeitskopie)
+================================================================================
+--- kcontrol/background/bgwallpaper.cpp
++++ kcontrol/background/bgwallpaper.cpp
@@ -149,7 +149,7 @@
mimeTypes += "image/svg+xml";
#endif
++++++ clock-applet-style.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,5 +1,5 @@
--- kicker/applets/clock/clockapplet.kcfg
-+++ kicker/applets/clock/clockapplet.kcfg 2005/03/01 09:36:22
++++ kicker/applets/clock/clockapplet.kcfg
@@ -14,7 +14,7 @@
<choice name="Analog"/>
<choice name="Fuzzy"/>
++++++ clock-use-yast.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,11 +1,8 @@
Index: kicker/applets/clock/clock.cpp
-===================================================================
-RCS file: /home/kde/kdebase/kicker/applets/clock/clock.cpp,v
-retrieving revision 1.203
-diff -u -3 -p -u -r1.203 clock.cpp
---- kicker/applets/clock/clock.cpp 12 Feb 2005 09:59:11 -0000 1.203
-+++ kicker/applets/clock/clock.cpp 17 Feb 2005 14:37:32 -0000
-@@ -1412,24 +1412,25 @@ void ClockApplet::contextMenuActivated(i
+================================================================================
+--- kicker/applets/clock/clock.cpp
++++ kicker/applets/clock/clock.cpp
+@@ -1416,24 +1416,25 @@
return;
};
@@ -41,7 +38,7 @@
break;
case 110:
preferences(true);
-@@ -1437,6 +1438,12 @@ void ClockApplet::contextMenuActivated(i
+@@ -1441,6 +1442,12 @@
} /* switch() */
}
@@ -54,14 +51,9 @@
void ClockApplet::aboutToShowContextMenu()
{
bool bImmutable = config()->isImmutable();
-Index: kicker/applets/clock/clock.h
-===================================================================
-RCS file: /home/kde/kdebase/kicker/applets/clock/clock.h,v
-retrieving revision 1.57
-diff -u -3 -p -u -r1.57 clock.h
---- kicker/applets/clock/clock.h 12 Feb 2005 09:59:11 -0000 1.57
-+++ kicker/applets/clock/clock.h 17 Feb 2005 14:37:32 -0000
-@@ -49,6 +49,7 @@ class Zone;
+--- kicker/applets/clock/clock.h
++++ kicker/applets/clock/clock.h
+@@ -50,6 +50,7 @@
class KPopupMenu;
class Prefs;
class ClockApplet;
@@ -69,7 +61,7 @@
namespace KIO
{
-@@ -293,6 +294,7 @@ protected slots:
+@@ -297,6 +298,7 @@
void aboutToShowContextMenu();
void fixupLayout();
void globalPaletteChange();
++++++ default-kdeprintfax.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,5 +1,5 @@
--- kdeprint/kdeprintfax/confsystem.cpp
-+++ kdeprint/kdeprintfax/confsystem.cpp 2005/01/28 12:51:19
++++ kdeprint/kdeprintfax/confsystem.cpp
@@ -103,7 +103,7 @@
m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd));
m_commands << conf->readPathEntry("Mgetty", defaultCommand(mgetty_default_cmd));
++++++ default_fonts.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -5,7 +5,7 @@
// KDE Display fonts setup tab
//
// Copyright (c) Mark Donohoe 1997
-@@ -526,11 +527,11 @@
+@@ -508,11 +509,11 @@
// Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
++++++ disable-kcm-modules.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,7 +1,7 @@
--- kcontrol/Makefile.am
-+++ kcontrol/Makefile.am 2004/07/19 11:13:18
++++ kcontrol/Makefile.am
@@ -31,7 +31,7 @@
- SUBDIRS = bell background filetypes samba krdb input info ioslaveinfo kdm\
+ SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo kdm\
kicker locale launch keys kio konq style kded \
konqhtml ebrowsing arts kcontrol knotify\
- clock pics $(ACCESS_SUBDIR) colors energy fonts css \
++++++ disable-kcmaccess.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,6 +1,6 @@
--- kcontrol/access/kaccess.cpp
-+++ kcontrol/access/kaccess.cpp 2005/03/14 10:51:41
-@@ -144,7 +144,7 @@
++++ kcontrol/access/kaccess.cpp
+@@ -238,7 +238,7 @@
xkb->ctrls->debounce_delay = config->readNumEntry("BounceKeysDelay", 500);
// gestures for enabling the other features
++++++ fix-kcontrol-yast.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,5 +1,5 @@
---- modules.cpp.sav 2005-07-18 17:04:14.000000000 +0200
-+++ kcontrol/kcontrol/modules.cpp 2005-08-22 17:08:09.000000000 +0200
+--- kcontrol/kcontrol/modules.cpp
++++ kcontrol/kcontrol/modules.cpp
@@ -19,6 +19,7 @@
#include
@@ -8,7 +8,7 @@
#include
-@@ -59,6 +60,10 @@ ConfigModule::~ConfigModule()
+@@ -59,6 +60,10 @@
ProxyWidget *ConfigModule::module()
{
@@ -19,7 +19,7 @@
if (_module)
return _module;
-@@ -160,6 +165,7 @@ void ConfigModule::runAsRoot()
+@@ -161,6 +166,7 @@
// prepare the process to run the kcmshell
QString cmd = service()->exec().stripWhiteSpace();
bool kdeshell = false;
@@ -27,7 +27,7 @@
if (cmd.left(5) == "kdesu")
{
cmd = cmd.remove(0,5).stripWhiteSpace();
-@@ -177,6 +183,15 @@ void ConfigModule::runAsRoot()
+@@ -178,6 +184,15 @@
kdeshell = true;
}
@@ -43,7 +43,7 @@
// run the process
QString kdesu = KStandardDirs::findExe("kdesu");
if (!kdesu.isEmpty())
-@@ -188,12 +203,12 @@ void ConfigModule::runAsRoot()
+@@ -189,12 +204,12 @@
// in that case the modules is started through kdesud and kdesu
// returns before the module is running and that doesn't work.
// We also don't have a way to close the module in that case.
++++++ fix-kio-smb-auth.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,12 +1,9 @@
? kioslave/smb/kio_smb_la_all_cpp.cpp
Index: kioslave/smb/kio_smb_auth.cpp
-===================================================================
-RCS file: /home/kde/kdebase/kioslave/smb/kio_smb_auth.cpp,v
-retrieving revision 1.29
-diff -u -3 -p -r1.29 kio_smb_auth.cpp
---- kioslave/smb/kio_smb_auth.cpp 22 Nov 2004 14:01:23 -0000 1.29
-+++ kioslave/smb/kio_smb_auth.cpp 4 Mar 2005 16:25:37 -0000
-@@ -144,6 +144,7 @@ bool SMBSlave::checkPassword(SMBUrl &url
+================================================================================
+--- kioslave/smb/kio_smb_auth.cpp
++++ kioslave/smb/kio_smb_auth.cpp
+@@ -144,6 +144,7 @@
if ( openPassDlg(info) ) {
kdDebug(KIO_SMB) << "openPassDlg returned " << info.username << endl;
url.setUser(info.username);
++++++ fix-lockup-from-gnome-apps.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,6 +1,6 @@
---- khelpcenter/navigator.cpp.orig 2004-10-04 13:51:54.000000000 +0200
-+++ khelpcenter/navigator.cpp 2004-10-04 17:56:45.635692352 +0200
-@@ -357,9 +357,14 @@
+--- khelpcenter/navigator.cpp
++++ khelpcenter/navigator.cpp
+@@ -333,9 +333,14 @@
// First, populate the NavigatorAppItems if we don't want the home page
if ( url != homeURL() ) {
for ( QListViewItem *item = mContentsTree->firstChild(); item;
++++++ fix_default_theme_reset.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,6 +1,6 @@
---- kcontrol/kthememanager/ktheme.cpp.sav 2005-07-19 16:09:21.000000000 +0200
-+++ kcontrol/kthememanager/ktheme.cpp 2005-09-06 15:46:21.000000000 +0200
-@@ -188,11 +188,11 @@ QString KTheme::createYourself( bool pac
+--- kcontrol/kthememanager/ktheme.cpp
++++ kcontrol/kthememanager/ktheme.cpp
+@@ -188,11 +188,11 @@
globalConf->setGroup( "Icons" );
QDomElement iconElem = m_dom.createElement( "icons" );
iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );
@@ -17,7 +17,7 @@
m_root.appendChild( iconElem );
// 4. Sounds
-@@ -702,7 +702,7 @@ QString KTheme::getProperty( QDomElement
+@@ -704,7 +704,7 @@
}
void KTheme::createIconElems( const QString & group, const QString & object,
@@ -26,7 +26,7 @@
{
cfg->setGroup( group );
QStringList elemNames;
-@@ -721,7 +721,9 @@ void KTheme::createIconElems( const QStr
+@@ -723,7 +723,9 @@
QDomElement tmpCol = m_dom.createElement( *it );
tmpCol.setAttribute( "object", object );
@@ -37,9 +37,9 @@
tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) );
else if ( (*it).contains( "Effect" ) )
tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) );
---- kcontrol/kthememanager/ktheme.h.sav 2005-05-04 15:47:29.000000000 +0200
-+++ kcontrol/kthememanager/ktheme.h 2005-09-06 15:45:08.000000000 +0200
-@@ -155,11 +155,12 @@ private:
+--- kcontrol/kthememanager/ktheme.h
++++ kcontrol/kthememanager/ktheme.h
+@@ -155,11 +155,12 @@
* Creates a list of "icon" elements based on:
* @param group The group in the KConfig object @p cfg
* @param object Specifier (similiar, but not identical to @p group)
++++++ hide-only-showin-entries.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,11 +1,8 @@
Index: konqueror/konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1406.2.3
-diff -u -3 -p -r1.1406.2.3 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc 3 Mar 2005 01:06:02 -0000 1.1406.2.3
-+++ konqueror/konq_mainwindow.cc 22 Mar 2005 17:31:32 -0000
-@@ -4805,6 +4805,9 @@ void KonqMainWindow::updateOpenWithActio
+================================================================================
+--- konqueror/konq_mainwindow.cc
++++ konqueror/konq_mainwindow.cc
+@@ -4866,6 +4866,9 @@
KTrader::OfferList::ConstIterator end = services.end();
for (; it != end; ++it )
{
++++++ improve-panelservicemenu-geticonset.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,6 +1,6 @@
--- kicker/kicker/ui/service_mnu.cpp
+++ kicker/kicker/ui/service_mnu.cpp
-@@ -386,6 +386,12 @@
+@@ -419,6 +419,12 @@
KIcon::ActiveState,
0,
true);
@@ -13,7 +13,7 @@
// make sure they are not larger than 20x20
if (normal.width() > 20 || normal.height() > 20)
-@@ -398,8 +404,14 @@
+@@ -431,8 +437,14 @@
active.convertFromImage(active.convertToImage().smoothScale(20,20));
}
++++++ kappfinder-auto.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,16 +1,5 @@
---- kappfinder/apps/Multimedia/mplayer.desktop
-+++ kappfinder/apps/Multimedia/mplayer.desktop 2004/01/27 08:51:52
-@@ -64,7 +64,7 @@
- GenericName[zh_CN]=视频播放器
- GenericName[zh_TW]=視像檔播放程式
- GenericName[zu]=Umdlali we-Vidiyo
--Exec=gmplayer %U
-+Exec=gmplayer -quiet %u
- Icon=video
- MimeType=application/vnd.ms-asf;video/mpeg;video/quicktime;video/x-flic;video/x-msvideo
- Name=MPlayer
--- kappfinder/Makefile.am
-+++ kappfinder/Makefile.am 2004/01/27 08:51:52
++++ kappfinder/Makefile.am
@@ -1,11 +1,10 @@
SUBDIRS = apps
@@ -24,3 +13,14 @@
kappfinder_install_SOURCES = main_install.cpp common.cpp
kappfinder_install_LDADD = $(LIB_KDEUI)
kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+--- kappfinder/apps/Multimedia/mplayer.desktop
++++ kappfinder/apps/Multimedia/mplayer.desktop
+@@ -75,7 +75,7 @@
+ GenericName[zh_CN]=视频播放器
+ GenericName[zh_TW]=視像檔播放程式
+ GenericName[zu]=Umdlali we-Vidiyo
+-Exec=gmplayer %U
++Exec=gmplayer -quiet %u
+ Icon=video
+ MimeType=application/vnd.ms-asf;video/mpeg;video/quicktime;video/x-flic;video/x-msvideo
+ Name=MPlayer
++++++ kcm_kio-no-error.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,7 +1,7 @@
Index: kcontrol/kio/main.cpp
-===================================================================
---- kcontrol/kio/main.cpp (revision 532264)
-+++ kcontrol/kio/main.cpp (working copy)
+================================================================================
+--- kcontrol/kio/main.cpp
++++ kcontrol/kio/main.cpp
@@ -105,7 +105,7 @@
tabs.addTab(smbPage, i18n("&Windows Shares"));
connect(smbPage,SIGNAL(changed(bool)), SLOT( changed() ));
++++++ kcminit-ignore-arts.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,5 +1,5 @@
---- kcminit.orig/main.cpp 2006-01-29 18:59:26.000000000 +0100
-+++ kcminit/main.cpp 2006-01-29 19:06:46.000000000 +0100
+--- kcminit/main.cpp
++++ kcminit/main.cpp
@@ -98,6 +98,9 @@
if (library.isEmpty())
library = service->library();
++++++ kcmsamba_log.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,7 +1,7 @@
Index: kcmsambalog.cpp
-===================================================================
---- kcontrol/samba/kcmsambalog.cpp (revision 517221)
-+++ kcontrol/samba/kcmsambalog.cpp (working copy)
+================================================================================
+--- kcontrol/samba/kcmsambalog.cpp
++++ kcontrol/samba/kcmsambalog.cpp
@@ -39,7 +39,7 @@
,configFile(config)
,filesCount(0)
++++++ kcmshell_use_kde-sound.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,7 +1,7 @@
Index: kcontrol/info/sound.desktop
-===================================================================
---- kcontrol/info/sound.desktop (revision 523469)
-+++ kcontrol/info/sound.desktop (working copy)
+================================================================================
+--- kcontrol/info/sound.desktop
++++ kcontrol/info/sound.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
++++++ kcontrol-lookandfeel.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,5 +1,5 @@
---- kcontrol/kicker/lookandfeeltab_impl.cpp.sav 2006-03-17 17:55:51.000000000 +0100
-+++ kcontrol/kicker/lookandfeeltab_impl.cpp 2006-03-17 17:55:34.000000000 +0100
+--- kcontrol/kicker/lookandfeeltab_impl.cpp
++++ kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -33,6 +33,7 @@
#include
#include
@@ -8,7 +8,7 @@
#include "advancedDialog.h"
#include "global.h"
#include "main.h"
-@@ -128,6 +129,9 @@ void LookAndFeelTab::previewBackground(c
+@@ -128,6 +129,9 @@
KickerLib::colorize(tmpImg);
theme_preview.convertFromImage(tmpImg);
if(!theme_preview.isNull()) {
++++++ kcontrol.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:09.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:09.000000000 +0200
@@ -1,5 +1,5 @@
--- kcontrol/kcontrol/KControl.desktop
-+++ kcontrol/kcontrol/KControl.desktop 2005/03/14 09:39:49
++++ kcontrol/kcontrol/KControl.desktop
@@ -1,4 +1,6 @@
[Desktop Entry]
+Categories=Qt;KDE;X-SuSE-core
++++++ kdebase_http_offline_mode.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:10.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:10.000000000 +0200
@@ -1,37 +1,7 @@
Index: konqueror/konq_mainwindow.h
-===================================================================
---- konqueror/konq_mainwindow.h (revision 513386)
-+++ konqueror/konq_mainwindow.h (working copy)
-@@ -363,6 +363,7 @@
- void slotOpenTerminal();
- void slotOpenLocation();
- void slotToolFind();
-+ void slotWorkOffline();
-
- // View menu
- void slotViewModeToggle( bool toggle );
-@@ -599,6 +600,7 @@
-
- bool stayPreloaded();
- bool checkPreloadResourceUsage();
-+ bool isWorkingOffline();
-
- QObject* lastFrame( KonqView *view );
-
-@@ -666,7 +668,8 @@
-
- KToggleAction *m_paShowMenuBar;
- KToggleAction *m_paShowStatusBar;
--
-+ KToggleAction *m_paWorkOffline;
-+
- KToggleFullScreenAction *m_ptaFullScreen;
-
- uint m_bLocationBarConnected:1;
-Index: konqueror/konq_mainwindow.cc
-===================================================================
---- konqueror/konq_mainwindow.cc (revision 513386)
-+++ konqueror/konq_mainwindow.cc (working copy)
+================================================================================
+--- konqueror/konq_mainwindow.cc
++++ konqueror/konq_mainwindow.cc
@@ -101,6 +101,8 @@
#include
#include
@@ -60,7 +30,7 @@
m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", 0 /*not KStdAccel::find!*/, this, SLOT( slotToolFind() ), actionCollection(), "findfile" );
m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
-@@ -5306,6 +5311,36 @@
+@@ -5309,6 +5314,36 @@
}
}
@@ -97,10 +67,36 @@
void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group )
{
static const QString& http = KGlobal::staticQString( "http" );
-Index: konqueror/konq_misc.cc
-===================================================================
---- konqueror/konq_misc.cc (revision 513386)
-+++ konqueror/konq_misc.cc (working copy)
+--- konqueror/konq_mainwindow.h
++++ konqueror/konq_mainwindow.h
+@@ -363,6 +363,7 @@
+ void slotOpenTerminal();
+ void slotOpenLocation();
+ void slotToolFind();
++ void slotWorkOffline();
+
+ // View menu
+ void slotViewModeToggle( bool toggle );
+@@ -599,6 +600,7 @@
+
+ bool stayPreloaded();
+ bool checkPreloadResourceUsage();
++ bool isWorkingOffline();
+
+ QObject* lastFrame( KonqView *view );
+
+@@ -666,7 +668,8 @@
+
+ KToggleAction *m_paShowMenuBar;
+ KToggleAction *m_paShowStatusBar;
+-
++ KToggleAction *m_paWorkOffline;
++
+ KToggleFullScreenAction *m_ptaFullScreen;
+
+ uint m_bLocationBarConnected:1;
+--- konqueror/konq_misc.cc
++++ konqueror/konq_misc.cc
@@ -215,6 +215,8 @@
// We can't use "about:" as it is, KURL doesn't parse it.
if (_url == "about:plugins")
@@ -110,10 +106,8 @@
return "about:konqueror";
}
return _url; // return the original url if it cannot be filtered.
-Index: konqueror/konqueror.rc
-===================================================================
---- konqueror/konqueror.rc (revision 513386)
-+++ konqueror/konqueror.rc (working copy)
+--- konqueror/konqueror.rc
++++ konqueror/konqueror.rc
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
++++++ kdebase_khc_rellinks.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:10.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:10.000000000 +0200
@@ -1,7 +1,49 @@
Index: khelpcenter/mainwindow.cpp
-===================================================================
---- khelpcenter/mainwindow.cpp (revision 496992)
-+++ khelpcenter/mainwindow.cpp (working copy)
+================================================================================
+--- khelpcenter/khelpcenterui.rc
++++ khelpcenter/khelpcenterui.rc
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="khelpcenter" version="14">
++<kpartgui name="khelpcenter" version="15">
+ <MenuBar>
+ <Menu name="file" noMerge="1">
+ <text>&File</text>
+@@ -23,8 +23,8 @@
+ </Menu>
+ <Menu name="go_web">
+ <text>&Go</text>
+- <Action name="prevPage" />
+- <Action name="nextPage" />
++ <Action name="rellinks_previous" />
++ <Action name="rellinks_next" />
+ <Separator />
+ <Action name="back" />
+ <Action name="forward" />
+@@ -41,13 +41,19 @@
+ <Action name="go_home" />
+ <Action name="back" />
+ <Action name="forward" />
+- <Separator />
++ <Separator />
+ <Action name="printFrame" />
+ <Separator />
+ <Action name="copy_text" />
+ <Action name="find" />
+- <Separator />
+ <Action name="incFontSizes" />
+ <Action name="decFontSizes" />
++ <Separator />
++ <Action name="rellinks_top" />
++ <Action name="rellinks_up" />
++ <Action name="rellinks_first" />
++ <Action name="rellinks_previous" />
++ <Action name="rellinks_next" />
++ <Action name="rellinks_last" />
+ </ToolBar>
+ </kpartgui>
+--- khelpcenter/mainwindow.cpp
++++ khelpcenter/mainwindow.cpp
@@ -41,6 +41,7 @@
#include
#include
@@ -447,54 +489,8 @@
#include "mainwindow.moc"
// vim:ts=2:sw=2:et
-Index: khelpcenter/khelpcenterui.rc
-===================================================================
---- khelpcenter/khelpcenterui.rc (revision 496992)
-+++ khelpcenter/khelpcenterui.rc (working copy)
-@@ -1,5 +1,5 @@
- <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
--<kpartgui name="khelpcenter" version="14">
-+<kpartgui name="khelpcenter" version="15">
- <MenuBar>
- <Menu name="file" noMerge="1">
- <text>&File</text>
-@@ -23,8 +23,8 @@
- </Menu>
- <Menu name="go_web">
- <text>&Go</text>
-- <Action name="prevPage" />
-- <Action name="nextPage" />
-+ <Action name="rellinks_previous" />
-+ <Action name="rellinks_next" />
- <Separator />
- <Action name="back" />
- <Action name="forward" />
-@@ -41,13 +41,19 @@
- <Action name="go_home" />
- <Action name="back" />
- <Action name="forward" />
-- <Separator />
-+ <Separator />
- <Action name="printFrame" />
- <Separator />
- <Action name="copy_text" />
- <Action name="find" />
-- <Separator />
- <Action name="incFontSizes" />
- <Action name="decFontSizes" />
-+ <Separator />
-+ <Action name="rellinks_top" />
-+ <Action name="rellinks_up" />
-+ <Action name="rellinks_first" />
-+ <Action name="rellinks_previous" />
-+ <Action name="rellinks_next" />
-+ <Action name="rellinks_last" />
- </ToolBar>
- </kpartgui>
-Index: khelpcenter/mainwindow.h
-===================================================================
---- khelpcenter/mainwindow.h (revision 496992)
-+++ khelpcenter/mainwindow.h (working copy)
+--- khelpcenter/mainwindow.h
++++ khelpcenter/mainwindow.h
@@ -13,6 +13,15 @@
#include "navigator.h"
#include "glossary.h"
@@ -511,7 +507,7 @@
class KHTMLPart;
class QSplitter;
-@@ -68,12 +77,44 @@
+@@ -68,11 +77,43 @@
void writeConfig();
protected slots:
@@ -545,17 +541,16 @@
+ * @return Equivalent relation name
+ */
+ QString transformRevToRel(const QString &rev) ;
-
++
+ /**
+ * Go to the link (c) rellinks
+ * @param rel Relation name
+ * @param id Identifier of the menu item
+ */
+ void goToLink(const QString & rel, int id=0);
-+
+
private slots:
void slotGlossSelected(const GlossaryEntry &entry);
- void slotStarted(KIO::Job *job);
@@ -90,7 +131,29 @@
void slotConfigureFonts();
void slotCopySelectedText();
++++++ kdeeject.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:10.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:10.000000000 +0200
@@ -1,7 +1,7 @@
Index: kdeeject/kdeeject
-===================================================================
---- kdeeject/kdeeject (Revision 490055)
-+++ kdeeject/kdeeject (Arbeitskopie)
+================================================================================
+--- kdeeject/kdeeject
++++ kdeeject/kdeeject
@@ -4,12 +4,38 @@
#
# Copyright GPL v2 by David Faure
++++++ kdesktop-busy-cursor.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:10.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:10.000000000 +0200
@@ -1,5 +1,5 @@
---- kdesktop/startupid.cpp.sav 2005-09-29 21:34:14.000000000 +0200
-+++ kdesktop/startupid.cpp 2006-01-23 22:31:09.000000000 +0100
+--- kdesktop/startupid.cpp
++++ kdesktop/startupid.cpp
@@ -22,19 +22,34 @@
#include
@@ -38,7 +38,7 @@
connect( &update_timer, SIGNAL( timeout()), SLOT( update_startupid()));
connect( &startup_info,
SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )),
-@@ -85,14 +100,45 @@ void StartupId::gotRemoveStartup( const
+@@ -85,14 +100,45 @@
startups.remove( id_P );
if( startups.count() == 0 )
{
@@ -85,8 +85,8 @@
void StartupId::stop_startupid()
{
delete startup_widget;
---- kdesktop/startupid.h.sav 2005-09-29 21:34:14.000000000 +0200
-+++ kdesktop/startupid.h 2006-01-23 21:58:50.000000000 +0100
+--- kdesktop/startupid.h
++++ kdesktop/startupid.h
@@ -22,7 +22,7 @@
#include
@@ -114,7 +114,7 @@
void start_startupid( const QString& icon );
void stop_startupid();
protected slots:
-@@ -47,6 +48,7 @@ class StartupId
+@@ -47,6 +48,7 @@
void gotNewStartup( const KStartupInfoId& id, const KStartupInfoData& data );
void gotStartupChange( const KStartupInfoId& id, const KStartupInfoData& data );
void gotRemoveStartup( const KStartupInfoId& id );
++++++ kdesktop_icons.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,3 +1,41 @@
+--- kdesktop/KDesktopIface.h
++++ kdesktop/KDesktopIface.h
+@@ -107,6 +107,35 @@
+ * space for desktop icons
+ */
+ virtual void desktopIconsAreaChanged(const QRect &area, int screen) = 0;
++
++ /**
++ * Find the next free place for a not yet existing icon, so it fits
++ * in the user arrangement. Basicly prepare for icons to be moved in.
++ * It will try to find a place in the virtual grid near col,row
++ * where no other icon is.
++ *
++ * If you specify -1 for row or column, it will try to find the next
++ * free room where no other icon follows. E.g. if you specify column
++ * = -1 and row = 0, kdesktop will find the next vertical placement
++ * so that the icon appears at the end of the existing icons preferable
++ * in the first column. If the first column is full, it will find the
++ * next free room in the second column.
++ *
++ * If you specify both column and row, kdesktop won't care for aligning,
++ * or surrounding icons, but try to find the free place near the given
++ * grid place (e.g. specify 0,0 to find the nearest place in the left
++ * upper corner).
++ */
++ virtual QPoint findPlaceForIcon( int column, int row) = 0;
++
++ /// copy the desktop file in the Desktop and place it at x, y
++ virtual void addIcon(const QString &url, int x, int y) = 0;
++
++ /// same with specific destination
++ virtual void addIcon(const QString &url, const QString &dest, int x, int y) = 0;
++
++ /// remove the desktop file (either full path or relative)
++ virtual void removeIcon(const QString &dest) = 0;
+ };
+
+ #endif
--- kdesktop/desktop.cc
+++ kdesktop/desktop.cc
@@ -32,6 +32,8 @@
@@ -9,7 +47,7 @@
#include
#include
-@@ -57,6 +59,7 @@
+@@ -58,6 +60,7 @@
#include
#include
#include
@@ -17,7 +55,7 @@
// Create the equivalent of KAccelBase::connectItem
// and then remove this include and fix reconnects in initRoot() -- ellis
//#include
-@@ -971,4 +974,47 @@
+@@ -972,4 +975,47 @@
return QWidget::event(e);
}
@@ -66,10 +104,10 @@
+
#include "desktop.moc"
--- kdesktop/desktop.h
-+++ kdesktop/desktop.h 2004/06/26 15:00:26
-@@ -158,6 +158,11 @@
++++ kdesktop/desktop.h
+@@ -164,6 +164,11 @@
+ virtual void setIconsEnabled( bool enable );
virtual bool event ( QEvent * e );
- virtual bool isRunning() { return true; }
+ virtual QPoint findPlaceForIcon( int column, int row);
+ virtual void addIcon(const QString &url, int x, int y);
@@ -78,48 +116,10 @@
+
private slots:
void desktopResized();
-
---- kdesktop/KDesktopIface.h
-+++ kdesktop/KDesktopIface.h
-@@ -102,6 +102,35 @@
- * space for desktop icons
- */
- virtual void desktopIconsAreaChanged(const QRect &area, int screen) = 0;
-+
-+ /**
-+ * Find the next free place for a not yet existing icon, so it fits
-+ * in the user arrangement. Basicly prepare for icons to be moved in.
-+ * It will try to find a place in the virtual grid near col,row
-+ * where no other icon is.
-+ *
-+ * If you specify -1 for row or column, it will try to find the next
-+ * free room where no other icon follows. E.g. if you specify column
-+ * = -1 and row = 0, kdesktop will find the next vertical placement
-+ * so that the icon appears at the end of the existing icons preferable
-+ * in the first column. If the first column is full, it will find the
-+ * next free room in the second column.
-+ *
-+ * If you specify both column and row, kdesktop won't care for aligning,
-+ * or surrounding icons, but try to find the free place near the given
-+ * grid place (e.g. specify 0,0 to find the nearest place in the left
-+ * upper corner).
-+ */
-+ virtual QPoint findPlaceForIcon( int column, int row) = 0;
-+
-+ /// copy the desktop file in the Desktop and place it at x, y
-+ virtual void addIcon(const QString &url, int x, int y) = 0;
-+
-+ /// same with specific destination
-+ virtual void addIcon(const QString &url, const QString &dest, int x, int y) = 0;
-+
-+ /// remove the desktop file (either full path or relative)
-+ virtual void removeIcon(const QString &dest) = 0;
- };
- #endif
--- kdesktop/kdiconview.cc
-+++ kdesktop/kdiconview.cc 2004/06/26 14:59:08
-@@ -876,6 +876,18 @@
++++ kdesktop/kdiconview.cc
+@@ -946,6 +946,18 @@
kdDebug(1214) << "KDIconView::slotNewItems count=" << entries.count() << endl;
KFileItemListIterator it(entries);
KFileIVI* fileIVI = 0L;
@@ -138,7 +138,7 @@
for (; it.current(); ++it)
{
KURL url = it.current()->url();
-@@ -944,15 +956,6 @@
+@@ -1010,15 +1022,6 @@
kdDebug(1214)<<"Using saved position"<sync();
+ }
+void KDIconView::update( const QString &_url )
+{
@@ -266,8 +266,8 @@
+
#include "kdiconview.moc"
--- kdesktop/kdiconview.h
-+++ kdesktop/kdiconview.h 2004/06/26 15:00:55
-@@ -73,6 +73,8 @@
++++ kdesktop/kdiconview.h
+@@ -74,6 +74,8 @@
void refreshIcons();
QStringList selectedURLs();
@@ -276,9 +276,9 @@
/**
* Save the icon positions
*/
-@@ -96,6 +98,10 @@
+@@ -104,6 +106,10 @@
- static KURL desktopURL();
+ void startDirLister();
+ QPoint findPlaceForIconCol( int column, int dx, int dy );
+ QPoint findPlaceForIconRow( int row, int dx, int dy );
@@ -287,7 +287,7 @@
protected slots:
// slots connected to the icon view
void slotReturnPressed( QIconViewItem *item );
-@@ -104,8 +110,9 @@
+@@ -112,8 +118,9 @@
void slotMouseButtonClickedKDesktop(int _button, QIconViewItem* _item, const QPoint& _global);
void slotContextMenuRequested(QIconViewItem* _item, const QPoint& _global);
void slotEnableAction( const char * name, bool enabled );
++++++ kdesu-dont-keep-pwd.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,7 @@
Index: kdesu/kdesu/kdesu.cpp
-===================================================================
---- kdesu/kdesu/kdesu.cpp (revision 518219)
-+++ kdesu/kdesu/kdesu.cpp (working copy)
+================================================================================
+--- kdesu/kdesu/kdesu.cpp
++++ kdesu/kdesu/kdesu.cpp
@@ -269,7 +269,7 @@
}
++++++ kdesud-security.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,6 @@
--- kdesu/kdesud/kdesud.cpp
-+++ kdesu/kdesud/kdesud.cpp 2002/08/26 13:45:48
-@@ -47,6 +47,7 @@
++++ kdesu/kdesud/kdesud.cpp
+@@ -45,6 +45,7 @@
#include
#include
@@ -8,12 +8,12 @@
#include
#include
#include
-@@ -256,6 +257,8 @@
+@@ -248,6 +249,8 @@
int main(int argc, char *argv[])
{
+ prctl(PR_SET_DUMPABLE, 0);
+
KAboutData aboutData("kdesud", I18N_NOOP("KDE su daemon"),
- Version, I18N_NOOP("Daemon used by kdesu"),
- KAboutData::License_Artistic,
+ Version, I18N_NOOP("Daemon used by kdesu"),
+ KAboutData::License_Artistic,
++++++ kdm-admin-mode.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,18 +1,6 @@
---- kdm/kfrontend/themer/kdmlabel.cpp.orig 2006-01-09 18:47:48.100429819 +0100
-+++ kdm/kfrontend/themer/kdmlabel.cpp 2006-01-09 18:50:04.172535600 +0100
-@@ -213,6 +213,7 @@
- { "language", I18N_NOOP("&Language") },
- { "session", I18N_NOOP("Session &Type") },
- { "system", I18N_NOOP("&System") }, // i18n("Actions");
-+ { "admin", I18N_NOOP("&Administration") },
- { "disconnect", I18N_NOOP("&Disconnect") },
- { "quit", I18N_NOOP("&Quit") },
- { "halt", I18N_NOOP("Power O&ff") },
-Index: kdm/config.def
-===================================================================
---- kdm/config.def (Revision 476009)
-+++ kdm/config.def (Arbeitskopie)
-@@ -1979,6 +1979,17 @@
+--- kdm/config.def
++++ kdm/config.def
+@@ -1988,6 +1988,17 @@
Specify the widget style for the greeter. Empty means to use the
built-in default which currently is <literal>Plastik</literal>.
@@ -30,10 +18,18 @@
Key: ColorScheme
Type: string
Default: ""
-Index: kdm/kfrontend/kdmadmindialog.cpp
-===================================================================
---- kdm/kfrontend/kdmadmindialog.cpp (Revision 0)
-+++ kdm/kfrontend/kdmadmindialog.cpp (Revision 0)
+--- kdm/kfrontend/Makefile.am
++++ kdm/kfrontend/Makefile.am
+@@ -21,6 +21,7 @@
+ kchooser.cpp \
+ kgverify.cpp \
+ kdmshutdown.cpp \
++ kdmadmindialog.cpp \
+ kgreeter.cpp \
+ kgapp.cpp
+ kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+--- kdm/kfrontend/kdmadmindialog.cpp
++++ kdm/kfrontend/kdmadmindialog.cpp
@@ -0,0 +1,176 @@
+ /*
+
@@ -211,132 +207,8 @@
+
+
+#include "kdmadmindialog.moc"
-Index: kdm/kfrontend/kgreeter.h
-===================================================================
---- kdm/kfrontend/kgreeter.h (Revision 476009)
-+++ kdm/kfrontend/kgreeter.h (Arbeitskopie)
-@@ -145,6 +145,7 @@
- void slotThemeActivated( const QString &id );
- void slotSessMenu();
- void slotActionMenu();
-+ void slotAskAdminPassword();
-
- protected:
- virtual void updateStatus( bool fail, bool caps, int timedleft );
-@@ -157,7 +158,7 @@
- KdmThemer *themer;
- KdmItem *caps_warning, *xauth_warning, *pam_error, *timed_label,
- *console_rect, *userlist_rect,
-- *session_button, *system_button;
-+ *session_button, *system_button, *admin_button;
-
- public: // from KGVerifyHandler
- virtual void verifyFailed();
-Index: kdm/kfrontend/sessions/admin.desktop
-===================================================================
---- kdm/kfrontend/sessions/admin.desktop (Revision 0)
-+++ kdm/kfrontend/sessions/admin.desktop (Revision 0)
-@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Type=XSession
-+Exec=YaSTadminSession
-+TryExec=YaSTadminSession
-+Name=admin
-+Comment=Yast Admin Session
-Index: kdm/kfrontend/sessions/Makefile.am
-===================================================================
---- kdm/kfrontend/sessions/Makefile.am (Revision 476009)
-+++ kdm/kfrontend/sessions/Makefile.am (Arbeitskopie)
-@@ -1,6 +1,6 @@
- sessionsdir = $(kde_datadir)/kdm/sessions
- sessions_DATA = \
-- kde.desktop gnome.desktop \
-+ admin.desktop kde.desktop gnome.desktop \
- 9wm.desktop \
- aewm++.desktop \
- aewm.desktop \
-Index: kdm/kfrontend/kgreeter.cpp
-===================================================================
---- kdm/kfrontend/kgreeter.cpp (Revision 476011)
-+++ kdm/kfrontend/kgreeter.cpp (Arbeitskopie)
-@@ -27,6 +27,7 @@
- #include "kdmconfig.h"
- #include "kdmclock.h"
- #include "kdm_greet.h"
-+#include "kdmadmindialog.h"
- #include "themer/kdmthemer.h"
- #include "themer/kdmitem.h"
- #include "themer/kdmlabel.h"
-@@ -469,7 +470,7 @@
- for (char **dit = _sessionsDirs; *dit; ++dit) {
- QStringList ents = QDir( *dit ).entryList();
- for (QStringList::ConstIterator it = ents.begin(); it != ents.end(); ++it)
-- if ((*it).endsWith( ".desktop" )) {
-+ if ((*it).endsWith( ".desktop" ) && !(*it).endsWith("admin.desktop")) {
- KSimpleConfig dsk( QString( *dit ).append( '/' ).append( *it ) );
- dsk.setGroup( "Desktop Entry" );
- putSession( (*it).left( (*it).length() - 8 ),
-@@ -608,6 +609,17 @@
- return;
- }
- } else {
-+ if (!strcmp(sess, "admin")) {
-+ // need to get the original
-+ GSendInt( G_GetDmrc);
-+ GSendStr( "OrigSession");
-+ sess = GRecvStr();
-+ if (!sess) {
-+ free(sess);
-+ sess = strdup("default");
-+ }
-+ }
-+
- for (uint i = 0; i < sessionTypes.count() && !sessionTypes[i].hid; i++)
- if (sessionTypes[i].type == sess) {
- free( sess );
-@@ -950,6 +962,12 @@
- }
- }
-
-+ admin_button = themer->findNode( "admin_button");
-+ if ( admin_button ) {
-+ if ( !_useAdminSession )
-+ admin_button->hide( true );
-+ }
-+
- QPopupMenu *plugMenu = verify->getPlugMenu();
- if (plugMenu) {
- inserten( i18n("&Authentication Method"), 0, plugMenu );
-@@ -1051,6 +1069,8 @@
- slotSessMenu();
- else if (id == "system_button")
- slotActionMenu();
-+ else if (id == "admin_button")
-+ slotAskAdminPassword();
- }
-
- void
-@@ -1077,4 +1097,15 @@
- accept();
- }
-
-+void
-+KThemedGreeter::slotAskAdminPassword()
-+{
-+ KDMAdmin k(curUser, this);
-+ if (k.exec()) {
-+ GSendInt(G_Ready);
-+ hide();
-+ done(ex_exit);
-+ }
-+}
-+
- #include "kgreeter.moc"
-Index: kdm/kfrontend/kdmadmindialog.h
-===================================================================
---- kdm/kfrontend/kdmadmindialog.h (Revision 0)
-+++ kdm/kfrontend/kdmadmindialog.h (Revision 0)
+--- kdm/kfrontend/kdmadmindialog.h
++++ kdm/kfrontend/kdmadmindialog.h
@@ -0,0 +1,70 @@
+ /*
+
@@ -408,15 +280,127 @@
+};
+
+#endif
-Index: kdm/kfrontend/Makefile.am
-===================================================================
---- kdm/kfrontend/Makefile.am (Revision 476009)
-+++ kdm/kfrontend/Makefile.am (Arbeitskopie)
-@@ -21,6 +21,7 @@
- kchooser.cpp \
- kgverify.cpp \
- kdmshutdown.cpp \
-+ kdmadmindialog.cpp \
- kgreeter.cpp \
- kgapp.cpp
- kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+--- kdm/kfrontend/kgreeter.cpp
++++ kdm/kfrontend/kgreeter.cpp
+@@ -27,6 +27,7 @@
+ #include "kdmconfig.h"
+ #include "kdmclock.h"
+ #include "kdm_greet.h"
++#include "kdmadmindialog.h"
+ #include "themer/kdmthemer.h"
+ #include "themer/kdmitem.h"
+ #include "themer/kdmlabel.h"
+@@ -469,7 +470,7 @@
+ for (char **dit = _sessionsDirs; *dit; ++dit) {
+ QStringList ents = QDir( *dit ).entryList();
+ for (QStringList::ConstIterator it = ents.begin(); it != ents.end(); ++it)
+- if ((*it).endsWith( ".desktop" )) {
++ if ((*it).endsWith( ".desktop" ) && !(*it).endsWith("admin.desktop")) {
+ KSimpleConfig dsk( QString( *dit ).append( '/' ).append( *it ) );
+ dsk.setGroup( "Desktop Entry" );
+ putSession( (*it).left( (*it).length() - 8 ),
+@@ -608,6 +609,17 @@
+ return;
+ }
+ } else {
++ if (!strcmp(sess, "admin")) {
++ // need to get the original
++ GSendInt( G_GetDmrc);
++ GSendStr( "OrigSession");
++ sess = GRecvStr();
++ if (!sess) {
++ free(sess);
++ sess = strdup("default");
++ }
++ }
++
+ for (uint i = 0; i < sessionTypes.count() && !sessionTypes[i].hid; i++)
+ if (sessionTypes[i].type == sess) {
+ free( sess );
+@@ -954,6 +966,12 @@
+ }
+ }
+
++ admin_button = themer->findNode( "admin_button");
++ if ( admin_button ) {
++ if ( !_useAdminSession )
++ admin_button->hide( true );
++ }
++
+ QPopupMenu *plugMenu = verify->getPlugMenu();
+ if (plugMenu) {
+ inserten( i18n("&Authentication Method"), 0, plugMenu );
+@@ -1055,6 +1073,8 @@
+ slotSessMenu();
+ else if (id == "system_button")
+ slotActionMenu();
++ else if (id == "admin_button")
++ slotAskAdminPassword();
+ }
+
+ void
+@@ -1081,4 +1101,15 @@
+ accept();
+ }
+
++void
++KThemedGreeter::slotAskAdminPassword()
++{
++ KDMAdmin k(curUser, this);
++ if (k.exec()) {
++ GSendInt(G_Ready);
++ hide();
++ done(ex_exit);
++ }
++}
++
+ #include "kgreeter.moc"
+--- kdm/kfrontend/kgreeter.h
++++ kdm/kfrontend/kgreeter.h
+@@ -145,6 +145,7 @@
+ void slotThemeActivated( const QString &id );
+ void slotSessMenu();
+ void slotActionMenu();
++ void slotAskAdminPassword();
+
+ protected:
+ virtual void updateStatus( bool fail, bool caps, int timedleft );
+@@ -157,7 +158,7 @@
+ KdmThemer *themer;
+ KdmItem *caps_warning, *xauth_warning, *pam_error, *timed_label,
+ *console_rect, *userlist_rect,
+- *session_button, *system_button;
++ *session_button, *system_button, *admin_button;
+
+ public: // from KGVerifyHandler
+ virtual void verifyFailed();
+--- kdm/kfrontend/sessions/Makefile.am
++++ kdm/kfrontend/sessions/Makefile.am
+@@ -1,6 +1,6 @@
+ sessionsdir = $(kde_datadir)/kdm/sessions
+ sessions_DATA = \
+- kde.desktop gnome.desktop \
++ admin.desktop kde.desktop gnome.desktop \
+ 9wm.desktop \
+ aewm++.desktop \
+ aewm.desktop \
+--- kdm/kfrontend/sessions/admin.desktop
++++ kdm/kfrontend/sessions/admin.desktop
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++Encoding=UTF-8
++Type=XSession
++Exec=YaSTadminSession
++TryExec=YaSTadminSession
++Name=admin
++Comment=Yast Admin Session
+--- kdm/kfrontend/themer/kdmlabel.cpp
++++ kdm/kfrontend/themer/kdmlabel.cpp
+@@ -213,6 +213,7 @@
+ { "language", I18N_NOOP("&Language") },
+ { "session", I18N_NOOP("Session &Type") },
+ { "system", I18N_NOOP("&System") }, // i18n("Actions");
++ { "admin", I18N_NOOP("&Administration") },
+ { "disconnect", I18N_NOOP("&Disconnect") },
+ { "quit", I18N_NOOP("&Quit") },
+ { "halt", I18N_NOOP("Power O&ff") },
++++++ kdm-aliasing.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,5 +1,5 @@
--- kdm/backend/Makefile.am
-+++ kdm/backend/Makefile.am 2005/02/16 10:59:04
++++ kdm/backend/Makefile.am
@@ -1,5 +1,6 @@
# forcibly remove thread-related defines & flags
AUTOMAKE_OPTIONS = foreign
++++++ kdm-all-users-nopass.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,11 +1,20 @@
Index: kdm/config.def
-===================================================================
-RCS file: /home/kde/kdebase/kdm/config.def,v
-retrieving revision 1.23
-diff -u -3 -p -u -r1.23 config.def
---- kdm/config.def 23 Jan 2005 22:35:43 -0000 1.23
-+++ kdm/config.def 24 Jan 2005 14:09:06 -0000
-@@ -1708,6 +1708,15 @@ Description:
+================================================================================
+--- kdm/backend/client.c
++++ kdm/backend/client.c
+@@ -387,6 +387,9 @@
+ if (cursource != PWSRC_MANUAL)
+ return 1;
+
++ if (td->noPassAllUsers)
++ return 1;
++
+ for (hg = 0, fp = td->noPassUsers; *fp; fp++)
+ if (**fp == '@')
+ hg = 1;
+--- kdm/config.def
++++ kdm/config.def
+@@ -1852,6 +1852,15 @@
(and any other user with UID = 0).
<emphasis>Never</emphasis> list <systemitem class="username">root</systemitem>.
@@ -21,20 +30,3 @@
Key: AutoLoginEnable
Type: bool
Default: false
-Index: kdm/backend/client.c
-===================================================================
-RCS file: /home/kde/kdebase/kdm/backend/client.c,v
-retrieving revision 2.81
-diff -u -3 -p -u -r2.81 client.c
---- kdm/backend/client.c 22 Jan 2005 15:32:59 -0000 2.81
-+++ kdm/backend/client.c 24 Jan 2005 14:09:06 -0000
-@@ -396,6 +396,9 @@ AccNoPass( const char *un, struct passwd
- if (!strcmp( un, td->autoUser ))
- return 1;
-
-+ if (td->noPassAllUsers)
-+ return 1;
-+
- for (hg = 0, fp = td->noPassUsers; *fp; fp++)
- if (**fp == '@')
- hg = 1;
++++++ kdm-always-reinit-pam.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,7 @@
Index: kdm/backend/client.c
-===================================================================
---- kdm/backend/client.c (Revision 503240)
-+++ kdm/backend/client.c (Arbeitskopie)
+================================================================================
+--- kdm/backend/client.c
++++ kdm/backend/client.c
@@ -290,47 +290,37 @@
pdata->abort = FALSE;
pconv.conv = PAM_conv;
@@ -28,6 +28,25 @@
- Debug( "reusing old PAM handle\n" );
-/* this makes linux-pam crash ...
- if ((pretc = pam_set_item (pamh, PAM_SERVICE, psrv)) != PAM_SUCCESS)
+- goto pam_bail;
+-*/
+- if ((pretc = pam_set_item( pamh, PAM_CONV, &pconv )) != PAM_SUCCESS) {
+- pam_bail:
+- pam_end( pamh, pretc );
+- pamh = 0;
+- pam_bail2:
+- ReInitErrorLog();
+- LogError( "PAM error: %s\n", pam_strerror( pamh, pretc ) );
+- V_RET_FAIL( 0 );
+- }
+- if ((pretc = pam_set_item( pamh, PAM_USER, curuser )) != PAM_SUCCESS)
+- goto pam_bail;
+- } else {
+- opennew:
+- Debug( "opening new PAM handle\n" );
+- if ((pretc = pam_start( psrv, curuser, &pconv, &pamh )) != PAM_SUCCESS)
+- goto pam_bail2;
+- if ((pretc = pam_set_item( pamh, PAM_TTY, td->name )) != PAM_SUCCESS)
+ }
+
+ Debug( "opening new PAM handle\n" );
@@ -48,25 +67,6 @@
+ *cp = ':';
+ if (pretc != PAM_SUCCESS)
goto pam_bail;
--*/
-- if ((pretc = pam_set_item( pamh, PAM_CONV, &pconv )) != PAM_SUCCESS) {
-- pam_bail:
-- pam_end( pamh, pretc );
-- pamh = 0;
-- pam_bail2:
-- ReInitErrorLog();
-- LogError( "PAM error: %s\n", pam_strerror( pamh, pretc ) );
-- V_RET_FAIL( 0 );
-- }
-- if ((pretc = pam_set_item( pamh, PAM_USER, curuser )) != PAM_SUCCESS)
-- goto pam_bail;
-- } else {
-- opennew:
-- Debug( "opening new PAM handle\n" );
-- if ((pretc = pam_start( psrv, curuser, &pconv, &pamh )) != PAM_SUCCESS)
-- goto pam_bail2;
-- if ((pretc = pam_set_item( pamh, PAM_TTY, td->name )) != PAM_SUCCESS)
-- goto pam_bail;
- if ((td->displayType & d_location) == dForeign) {
- char *cp = strchr( td->name, ':' );
- *cp = 0;
++++++ kdm-cope-with-new-grub.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,7 @@
Index: kdm/backend/bootman.c
-===================================================================
---- kdm/backend/bootman.c (Revision 458092)
-+++ kdm/backend/bootman.c (Arbeitskopie)
+================================================================================
+--- kdm/backend/bootman.c
++++ kdm/backend/bootman.c
@@ -130,19 +130,14 @@
static void
commitGrub( void )
++++++ kdm-fix-default-kdmrc.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,8 +1,8 @@
Index: kdm/config.def
-===================================================================
---- kdm/config.def (Revision 449484)
-+++ kdm/config.def (Arbeitskopie)
-@@ -1874,7 +1874,7 @@
+================================================================================
+--- kdm/config.def
++++ kdm/config.def
+@@ -1930,7 +1930,7 @@
Key: SessionsDirs
Type: list
++++++ kdm-ignore-unresolvable-hosts.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,8 +1,8 @@
Index: kdm/kfrontend/kdm_config.c
-===================================================================
---- kdm/kfrontend/kdm_config.c (Revision 516500)
-+++ kdm/kfrontend/kdm_config.c (Arbeitskopie)
-@@ -1110,10 +1110,9 @@
+================================================================================
+--- kdm/kfrontend/kdm_config.c
++++ kdm/kfrontend/kdm_config.c
+@@ -1120,10 +1120,9 @@
(*aliasPtr)->hosts = nHosts;
(*aliasPtr)->nhosts = 0;
while ((hostOrAlias = ReadWord( &file, &len, TRUE ))) {
++++++ kdm-make_it_cool.diff ++++++
++++ 2072 lines (skipped)
++++ between KDE/kdebase3/kdm-make_it_cool.diff
++++ and STABLE/kdebase3/kdm-make_it_cool.diff
++++++ kdm-mark_autologin.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,6 @@
--- kdm/backend/client.c
-+++ kdm/backend/client.c 2005/02/14 10:33:11
-@@ -1139,6 +1139,8 @@
++++ kdm/backend/client.c
+@@ -1142,6 +1142,8 @@
env = setEnv( env, "PATH", curuid ? td->userPath : td->systemPath );
env = setEnv( env, "SHELL", p->pw_shell );
env = setEnv( env, "HOME", p->pw_dir );
++++++ kdm-path.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,5 +1,5 @@
--- kcontrol/kdm/background.cpp
-+++ kcontrol/kdm/background.cpp 2005/01/24 12:28:00
++++ kcontrol/kdm/background.cpp
@@ -51,7 +51,7 @@
" This is done by running some program (possibly xsetroot) in the script"
" specified in the Setup= option in kdmrc (usually Xsetup).") );
@@ -10,7 +10,7 @@
connect(m_background, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
--- kcontrol/kdm/main.cpp
-+++ kcontrol/kdm/main.cpp 2005/01/24 12:28:00
++++ kcontrol/kdm/main.cpp
@@ -24,6 +24,7 @@
#include
@@ -33,8 +33,8 @@
QVBoxLayout *top = new QVBoxLayout(this);
tab = new QTabWidget(this);
--- kdm/kfrontend/kdm_config.c
-+++ kdm/kfrontend/kdm_config.c 2005/01/24 12:32:53
-@@ -388,7 +388,8 @@
++++ kdm/kfrontend/kdm_config.c
+@@ -381,7 +381,8 @@
CONF_READ_ENTRIES
@@ -44,7 +44,7 @@
static Section *rootsec;
-@@ -409,9 +410,18 @@
+@@ -402,9 +403,18 @@
return;
confread = 1;
++++++ kdm-relaxed-auth.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,7 @@
Index: kdm/backend/auth.c
-===================================================================
---- kdm/backend/auth.c (Revision 500973)
-+++ kdm/backend/auth.c (Arbeitskopie)
+================================================================================
+--- kdm/backend/auth.c
++++ kdm/backend/auth.c
@@ -518,6 +518,7 @@
uname( &name );
writeAddr( FamilyLocal, strlen( name.nodename ), name.nodename,
++++++ kdm-use-latest-samba.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,7 @@
Index: kdmlib/kgreet_winbind.cpp
-===================================================================
---- kdmlib/kgreet_winbind.cpp (Revision 502757)
-+++ kdmlib/kgreet_winbind.cpp (Arbeitskopie)
+================================================================================
+--- kdmlib/kgreet_winbind.cpp
++++ kdmlib/kgreet_winbind.cpp
@@ -558,7 +558,7 @@
echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt();
domains = QStringList::split( ':', getConf( ctx, "winbind.Domains", QVariant( "" ) ).toString() );
++++++ khelpcenter-fix-docbook-indexing.patch ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,5 +1,27 @@
---- khelpcenter/searchhandlers/khc_docbookdig.pl.in.sav 2005-09-29 21:34:01.000000000 +0200
-+++ khelpcenter/searchhandlers/khc_docbookdig.pl.in 2006-02-08 19:01:09.000000000 +0100
+--- khelpcenter/kcmhelpcenter.cpp
++++ khelpcenter/kcmhelpcenter.cpp
+@@ -568,6 +568,9 @@
+
+ void KCMHelpCenter::slotIndexProgress()
+ {
++ if( !mProcess )
++ return;
++
+ kdDebug() << "KCMHelpCenter::slotIndexProgress()" << endl;
+
+ updateStatus();
+@@ -577,6 +580,9 @@
+
+ void KCMHelpCenter::slotIndexError( const QString &str )
+ {
++ if( !mProcess )
++ return;
++
+ kdDebug() << "KCMHelpCenter::slotIndexError()" << endl;
+
+ KMessageBox::sorry( this, i18n("Error executing indexing build command:\n%1")
+--- khelpcenter/searchhandlers/khc_docbookdig.pl.in
++++ khelpcenter/searchhandlers/khc_docbookdig.pl.in
@@ -85,7 +85,12 @@
exit 1;
}
@@ -52,25 +74,3 @@
my $ret = system( "$htdigbin/htdig -v -s -i -c $conffile" );
if ( $ret != 0 ) {
print STDERR "htdig failed\n";
---- khelpcenter/kcmhelpcenter.cpp.sav 2005-09-29 21:34:03.000000000 +0200
-+++ khelpcenter/kcmhelpcenter.cpp 2006-02-08 18:03:48.000000000 +0100
-@@ -568,6 +568,9 @@
-
- void KCMHelpCenter::slotIndexProgress()
- {
-+ if( !mProcess )
-+ return;
-+
- kdDebug() << "KCMHelpCenter::slotIndexProgress()" << endl;
-
- updateStatus();
-@@ -577,6 +580,9 @@
-
- void KCMHelpCenter::slotIndexError( const QString &str )
- {
-+ if( !mProcess )
-+ return;
-+
- kdDebug() << "KCMHelpCenter::slotIndexError()" << endl;
-
- KMessageBox::sorry( this, i18n("Error executing indexing build command:\n%1")
++++++ khelpcenter-gnome-support.patch ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,183 +1,7 @@
Index: khelpcenter/table-of-contents.xslt
-===================================================================
---- khelpcenter/table-of-contents.xslt (Revision 500973)
-+++ khelpcenter/table-of-contents.xslt (Arbeitskopie)
-@@ -8,6 +8,12 @@
- </table-of-contents>
-
-
-+
-+<table-of-contents>
-+
-+</table-of-contents>
-+
-+
-
- <chapter>
- <title></title>
-@@ -20,7 +26,15 @@
- <section>
- <title></title>
- <anchor></anchor>
-+
- </section>
-
-
-+
-+<subsection>
-+<title></title>
-+<anchor></anchor>
-+</subsection>
-+
-+
-
-Index: khelpcenter/view.cpp
-===================================================================
---- khelpcenter/view.cpp (Revision 500973)
-+++ khelpcenter/view.cpp (Arbeitskopie)
-@@ -146,21 +146,51 @@
- // assemble the local search paths
- const QStringList localDoc = KGlobal::dirs()->resourceDirs("html");
-
-+ kdDebug() << "Looking up help for: " << fname << endl;
-+
-+ QString path;
-+ QString file_name;
-+ int slash = fname.findRev ('/');
-+ if (slash == -1 || slash == 0) {
-+ path = fname;
-+ file_name = "/";
-+ } else {
-+ path = fname.left (slash);
-+ file_name = fname.right (fname.length() - slash);
-+ }
-+
-+ QStringList langs = KGlobal::locale()->languageList();
-+ QStringList::ConstIterator lang;
-+ for (lang = langs.begin(); lang != langs.end(); ++lang)
-+ if (*lang == "en")
-+ search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(file_name));
-+ else
-+ search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg(*lang).arg(file_name));
-+
-+ langs.append( "en" );
-+ langs.remove( "C" );
-+
-+ // this is kind of compat hack as we install our docs in en/ but the
-+ // default language is en_US
-+ for (QStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
-+ if ( *it == "en_US" )
-+ *it = "en";
-+
- // look up the different languages
-- for (int id=localDoc.count()-1; id >= 0; --id)
-+ int ldCount = localDoc.count();
-+ for (int id=0; id < ldCount; id++)
- {
-- QStringList langs = KGlobal::locale()->languageList();
-- langs.append( "en" );
-- langs.remove( "C" );
- QStringList::ConstIterator lang;
- for (lang = langs.begin(); lang != langs.end(); ++lang)
-- search.append(QString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(fname));
-+ search.append(QString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(path + file_name));
- }
-
- // try to locate the file
- QStringList::Iterator it;
- for (it = search.begin(); it != search.end(); ++it)
- {
-+ kdDebug() << "Looking for help in: " << *it << endl;
-+
- QFileInfo info(*it);
- if (info.exists() && info.isFile() && info.isReadable())
- return *it;
-@@ -168,7 +198,7 @@
- // Fall back to the index.docbook for this language if we couldn't find its
- // specific docbook file. If we are not looking up docbook (images,
- // css etc) then look in other languages first.
-- if ( ( *it ).endsWith( "docbook" ) )
-+ if ( ( *it ).endsWith( "docbook" ) || ( *it).endsWith( ".xml") )
- {
- QString file = (*it).left((*it).findRev('/')) + "/index.docbook";
- info.setFile(file);
-@@ -176,9 +206,15 @@
- {
- return *it;
- }
-+
-+ file = (*it).left((*it).findRev('/')) + "/" + path + ".xml";
-+ info.setFile(file);
-+ if (info.exists() && info.isFile() && info.isReadable())
-+ return *it;
- }
- }
-
-+
- return QString::null;
- }
-
-Index: khelpcenter/navigatorappitem.cpp
-===================================================================
---- khelpcenter/navigatorappitem.cpp (Revision 500973)
-+++ khelpcenter/navigatorappitem.cpp (Arbeitskopie)
-@@ -21,6 +21,8 @@
-
- #include "docentry.h"
-
-+#include
-+
- #include
- #include
-
-@@ -134,11 +136,42 @@
-
- QString NavigatorAppItem::documentationURL( KService *s )
- {
-+ static QString desktop;
-+ if (desktop.isNull()) {
-+ QString win_man = getenv("WINDOWMANAGER");
-+ if (win_man.contains ("gnome", FALSE))
-+ desktop = "GNOME";
-+ else if (win_man.contains ("kde", FALSE))
-+ desktop = "KDE";
-+ else
-+ desktop = "";
-+ kdDebug() << "NavigatorAppItem::desktop = " << desktop << endl;
-+ };
-+
-+ QString onlyShowIn = s->property("OnlyShowIn", QVariant::String).toString();
-+
-+ kdDebug() << "NavigatorAppItem::onlyShowIn = " << onlyShowIn << endl;
-+
-+ if ( !onlyShowIn.isNull() ) {
-+ if (desktop.isEmpty())
-+ return QString::null;
-+ QStringList list = QStringList::split (";", onlyShowIn);
-+ if ( ! list.contains (desktop) )
-+ return QString::null;
-+ }
-+
-+ QString notShowIn = s->property("NotShowIn", QVariant::String).toString();
-+ if ( !notShowIn.isNull() ) {
-+ QStringList list = QStringList::split (";", notShowIn);
-+ if ( list.contains (desktop) )
-+ return QString::null;
-+ }
-+
- QString docPath = s->property( "DocPath" ).toString();
- if ( docPath.isEmpty() )
- return QString::null;
-
-- if ( docPath.startsWith( "file:") || docPath.startsWith( "http:" ) )
-+ if ( docPath.startsWith( "file:") || docPath.startsWith( "http:" ) || docPath.startsWith( "ghelp:" ))
- return docPath;
-
- return QString( "help:/" ) + docPath;
-Index: khelpcenter/docentry.cpp
-===================================================================
---- khelpcenter/docentry.cpp (Revision 500973)
-+++ khelpcenter/docentry.cpp (Arbeitskopie)
+================================================================================
+--- khelpcenter/docentry.cpp
++++ khelpcenter/docentry.cpp
@@ -1,5 +1,6 @@
#include
#include
@@ -223,10 +47,8 @@
mName = file.readName();
mSearch = file.readEntry( "X-DOC-Search" );
mIcon = file.readIcon();
-Index: khelpcenter/navigator.cpp
-===================================================================
---- khelpcenter/navigator.cpp (Revision 500973)
-+++ khelpcenter/navigator.cpp (Arbeitskopie)
+--- khelpcenter/navigator.cpp
++++ khelpcenter/navigator.cpp
@@ -22,6 +22,7 @@
#include
#include
@@ -284,7 +106,7 @@
}
// If the navigator already has the given URL selected, do nothing.
-@@ -396,15 +432,43 @@
+@@ -401,15 +437,43 @@
TOC *tocTree = item->createTOC();
kdDebug( 1400 ) << "slotItemSelected(): Trying to build TOC for "
<< item->entry()->name() << endl;
@@ -333,3 +155,173 @@
kdDebug( 1400 ) << "slotItemSelected(): doc = " << doc << endl;
tocTree->build( doc );
+--- khelpcenter/navigatorappitem.cpp
++++ khelpcenter/navigatorappitem.cpp
+@@ -21,6 +21,8 @@
+
+ #include "docentry.h"
+
++#include
++
+ #include
+ #include
+
+@@ -134,11 +136,42 @@
+
+ QString NavigatorAppItem::documentationURL( KService *s )
+ {
++ static QString desktop;
++ if (desktop.isNull()) {
++ QString win_man = getenv("WINDOWMANAGER");
++ if (win_man.contains ("gnome", FALSE))
++ desktop = "GNOME";
++ else if (win_man.contains ("kde", FALSE))
++ desktop = "KDE";
++ else
++ desktop = "";
++ kdDebug() << "NavigatorAppItem::desktop = " << desktop << endl;
++ };
++
++ QString onlyShowIn = s->property("OnlyShowIn", QVariant::String).toString();
++
++ kdDebug() << "NavigatorAppItem::onlyShowIn = " << onlyShowIn << endl;
++
++ if ( !onlyShowIn.isNull() ) {
++ if (desktop.isEmpty())
++ return QString::null;
++ QStringList list = QStringList::split (";", onlyShowIn);
++ if ( ! list.contains (desktop) )
++ return QString::null;
++ }
++
++ QString notShowIn = s->property("NotShowIn", QVariant::String).toString();
++ if ( !notShowIn.isNull() ) {
++ QStringList list = QStringList::split (";", notShowIn);
++ if ( list.contains (desktop) )
++ return QString::null;
++ }
++
+ QString docPath = s->property( "DocPath" ).toString();
+ if ( docPath.isEmpty() )
+ return QString::null;
+
+- if ( docPath.startsWith( "file:") || docPath.startsWith( "http:" ) )
++ if ( docPath.startsWith( "file:") || docPath.startsWith( "http:" ) || docPath.startsWith( "ghelp:" ))
+ return docPath;
+
+ return QString( "help:/" ) + docPath;
+--- khelpcenter/table-of-contents.xslt
++++ khelpcenter/table-of-contents.xslt
+@@ -8,6 +8,12 @@
+ </table-of-contents>
+
+
++
++<table-of-contents>
++
++</table-of-contents>
++
++
+
+ <chapter>
+ <title></title>
+@@ -20,7 +26,15 @@
+ <section>
+ <title></title>
+ <anchor></anchor>
++
+ </section>
+
+
++
++<subsection>
++<title></title>
++<anchor></anchor>
++</subsection>
++
++
+
+--- khelpcenter/view.cpp
++++ khelpcenter/view.cpp
+@@ -146,21 +146,51 @@
+ // assemble the local search paths
+ const QStringList localDoc = KGlobal::dirs()->resourceDirs("html");
+
++ kdDebug() << "Looking up help for: " << fname << endl;
++
++ QString path;
++ QString file_name;
++ int slash = fname.findRev ('/');
++ if (slash == -1 || slash == 0) {
++ path = fname;
++ file_name = "/";
++ } else {
++ path = fname.left (slash);
++ file_name = fname.right (fname.length() - slash);
++ }
++
++ QStringList langs = KGlobal::locale()->languageList();
++ QStringList::ConstIterator lang;
++ for (lang = langs.begin(); lang != langs.end(); ++lang)
++ if (*lang == "en")
++ search.append(QString("/opt/gnome/share/gnome/help/%1/C%2").arg(path).arg(file_name));
++ else
++ search.append(QString("/opt/gnome/share/gnome/help/%1/%2%3").arg(path).arg(*lang).arg(file_name));
++
++ langs.append( "en" );
++ langs.remove( "C" );
++
++ // this is kind of compat hack as we install our docs in en/ but the
++ // default language is en_US
++ for (QStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
++ if ( *it == "en_US" )
++ *it = "en";
++
+ // look up the different languages
+- for (int id=localDoc.count()-1; id >= 0; --id)
++ int ldCount = localDoc.count();
++ for (int id=0; id < ldCount; id++)
+ {
+- QStringList langs = KGlobal::locale()->languageList();
+- langs.append( "en" );
+- langs.remove( "C" );
+ QStringList::ConstIterator lang;
+ for (lang = langs.begin(); lang != langs.end(); ++lang)
+- search.append(QString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(fname));
++ search.append(QString("%1%2/%3").arg(localDoc[id]).arg(*lang).arg(path + file_name));
+ }
+
+ // try to locate the file
+ QStringList::Iterator it;
+ for (it = search.begin(); it != search.end(); ++it)
+ {
++ kdDebug() << "Looking for help in: " << *it << endl;
++
+ QFileInfo info(*it);
+ if (info.exists() && info.isFile() && info.isReadable())
+ return *it;
+@@ -168,7 +198,7 @@
+ // Fall back to the index.docbook for this language if we couldn't find its
+ // specific docbook file. If we are not looking up docbook (images,
+ // css etc) then look in other languages first.
+- if ( ( *it ).endsWith( "docbook" ) )
++ if ( ( *it ).endsWith( "docbook" ) || ( *it).endsWith( ".xml") )
+ {
+ QString file = (*it).left((*it).findRev('/')) + "/index.docbook";
+ info.setFile(file);
+@@ -176,9 +206,15 @@
+ {
+ return *it;
+ }
++
++ file = (*it).left((*it).findRev('/')) + "/" + path + ".xml";
++ info.setFile(file);
++ if (info.exists() && info.isFile() && info.isReadable())
++ return *it;
+ }
+ }
+
++
+ return QString::null;
+ }
+
++++++ khelpcenter-localindices.patch ++++++
--- khelpcenter/kcmhelpcenter.cpp
+++ khelpcenter/kcmhelpcenter.cpp
@@ -321,6 +322,7 @@
void KCMHelpCenter::load()
{
+ findWriteableIndexDir();
mIndexDirLabel->setText( Prefs::indexDirectory() );
mListView->clear();
@@ -675,6 +677,12 @@
enableButtonOK( count != 0 );
}
+void KCMHelpCenter::findWriteableIndexDir()
+{
+ QFileInfo currentDir( Prefs::indexDirectory() );
+ if ( !currentDir.isWritable() )
+ Prefs::setIndexDirectory( KGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
+}
#include "kcmhelpcenter.moc"
// vim:ts=2:sw=2:et
--- khelpcenter/kcmhelpcenter.h
+++ khelpcenter/kcmhelpcenter.h
@@ -146,6 +146,11 @@
void advanceProgress();
+ /**
+ * Find a user-writeable location for the indices, if the current location
+ * is not.
+ */
+ void findWriteableIndexDir();
private:
KHC::SearchEngine *mEngine;
++++++ khelpcenter-use-suseconfig-indexer.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,8 +1,8 @@
Index: khelpcenter/navigator.cpp
-===================================================================
---- khelpcenter/navigator.cpp (revision 498759)
-+++ khelpcenter/navigator.cpp (working copy)
-@@ -585,10 +585,16 @@
+================================================================================
+--- khelpcenter/navigator.cpp
++++ khelpcenter/navigator.cpp
+@@ -654,10 +654,16 @@
bool Navigator::checkSearchIndex()
{
++++++ khelpcenter-use-susehelp.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,6 @@
-diff -upr kdebase-3.5.1-pre/khelpcenter/khelpcenter.desktop kdebase-3.5.1-post/khelpcenter/khelpcenter.desktop
---- kdebase-3.5.1-pre/khelpcenter/khelpcenter.desktop 2006-01-19 11:01:25.000000000 -0600
-+++ kdebase-3.5.1-post/khelpcenter/khelpcenter.desktop 2006-03-03 01:26:57.000000000 -0600
-@@ -116,7 +116,7 @@ Icon=khelpcenter
+--- kdebase-3.5.1/khelpcenter/khelpcenter.desktop
++++ kdebase-3.5.1/khelpcenter/khelpcenter.desktop
+@@ -116,7 +116,7 @@
DocPath=khelpcenter/index.html
Type=Service
Terminal=false
++++++ kicker-defaults.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,79 +1,8 @@
Index: kicker/menuext/system/systemmenu.desktop
-===================================================================
---- kicker/menuext/system/systemmenu.desktop (Revision 500974)
-+++ kicker/menuext/system/systemmenu.desktop (Arbeitskopie)
-@@ -1,52 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--Name=System Menu
--Name[af]=Stelsel Kieslys
--Name[bg]=Системно меню
--Name[bn]=সিস্টেম মেনু
--Name[br]=Meuziad ar reizhiad
--Name[ca]=Menú de sistema
--Name[cs]=Systémová nabídka
--Name[cy]=Dewislen y Cysawd
--Name[da]=Systemmenu
--Name[de]=System-Menü
--Name[el]=Μενού συστήματος
--Name[es]=Menú del sistema
--Name[et]=Süsteemi menüü
--Name[eu]=Sistemaren menua
--Name[fi]=Järjestelmävalikko
--Name[fr]=Menu du système
--Name[fy]=Systeemmenu
--Name[ga]=Roghchlár an Chórais
--Name[gl]=Sistema
--Name[hu]=Rendszermenü
--Name[is]=Kerfisvalmynd
--Name[it]=Menu di Sistema
--Name[ja]=システムメニュー
--Name[km]=ប្រព័ន្ធម៉ឺនុយ
--Name[lt]=Sistemos meniu
--Name[mk]=Системско мени
--Name[nb]=Systemmeny
--Name[nds]=Systeem-Menü
--Name[nl]=Systeemmenu
--Name[nn]=Systemmeny
--Name[pa]=ਸਿਸਟਮ ਮੇਨੂ
--Name[pl]=System
--Name[pt]=Menu do Sistema
--Name[pt_BR]=Menu Sistema
--Name[ru]=Система
--Name[se]=Vuogádatfállu
--Name[sl]=Sistem
--Name[sr]=Системски мени
--Name[sr@Latn]=Sistemski meni
--Name[sv]=Systemmeny
--Name[tg]=Менюи система
--Name[th]=เมนูระบบ
--Name[tr]=Sistem Menüsü
--Name[uk]=Системне меню
--Name[uz]=Тизим менюси
--Name[zh_CN]=系统菜单
--Name[zh_TW]=系統選單
-+Name=My System
- Comment=Menu of important system places
- Comment[af]=Kieslys vir belangrike stelsel plekke
- Comment[bg]=Меню за достъп до системните директории
-Index: kicker/libkicker/kickerSettings.kcfg
-===================================================================
---- kicker/libkicker/kickerSettings.kcfg (Revision 500974)
-+++ kicker/libkicker/kickerSettings.kcfg (Arbeitskopie)
-@@ -154,7 +154,7 @@
-
- <entry name="MenuExtensions" key="Extensions" type="StringList" >
- <label>Optional Menus</label>
-- <default>prefmenu.desktop,systemmenu.desktop</default>
-+ <default>recentdocs.desktop,systemmenu.desktop</default>
- </entry>
-
- <entry name="RecentAppsStat" type="StringList" >
-Index: kcontrol/kcontrol/KControl.desktop
-===================================================================
---- kcontrol/kcontrol/KControl.desktop (Revision 500974)
-+++ kcontrol/kcontrol/KControl.desktop (Arbeitskopie)
-@@ -5,84 +5,6 @@
+================================================================================
+--- kcontrol/kcontrol/KControl.desktop
++++ kcontrol/kcontrol/KControl.desktop
+@@ -7,84 +7,6 @@
Type=Application
DocPath=kcontrol/index.html
X-KDE-StartupNotify=true
@@ -159,10 +88,8 @@
+Name=Personal Settings
X-DCOP-ServiceType=Unique
Categories=Qt;KDE;Core;
-Index: kcontrol/kicker/menutab_impl.cpp
-===================================================================
---- kcontrol/kicker/menutab_impl.cpp (Revision 500974)
-+++ kcontrol/kicker/menutab_impl.cpp (Arbeitskopie)
+--- kcontrol/kicker/menutab_impl.cpp
++++ kcontrol/kicker/menutab_impl.cpp
@@ -154,10 +154,11 @@
QListViewItem *item(0);
for (item = m_subMenus->firstChild(); item; item = item->nextSibling())
@@ -178,3 +105,70 @@
m_showFrequent->setChecked(true);
}
+--- kicker/libkicker/kickerSettings.kcfg
++++ kicker/libkicker/kickerSettings.kcfg
+@@ -159,7 +159,7 @@
+
+ <entry name="MenuExtensions" key="Extensions" type="StringList" >
+ <label>Optional Menus</label>
+- <default>prefmenu.desktop,systemmenu.desktop</default>
++ <default>recentdocs.desktop,systemmenu.desktop</default>
+ </entry>
+
+ <entry name="RecentAppsStat" type="StringList" >
+--- kicker/menuext/system/systemmenu.desktop
++++ kicker/menuext/system/systemmenu.desktop
+@@ -1,52 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=System Menu
+-Name[af]=Stelsel Kieslys
+-Name[bg]=Системно меню
+-Name[bn]=সিস্টেম মেনু
+-Name[br]=Meuziad ar reizhiad
+-Name[ca]=Menú de sistema
+-Name[cs]=Systémová nabídka
+-Name[cy]=Dewislen y Cysawd
+-Name[da]=Systemmenu
+-Name[de]=System-Menü
+-Name[el]=Μενού συστήματος
+-Name[es]=Menú del sistema
+-Name[et]=Süsteemi menüü
+-Name[eu]=Sistemaren menua
+-Name[fi]=Järjestelmävalikko
+-Name[fr]=Menu du système
+-Name[fy]=Systeemmenu
+-Name[ga]=Roghchlár an Chórais
+-Name[gl]=Sistema
+-Name[hu]=Rendszermenü
+-Name[is]=Kerfisvalmynd
+-Name[it]=Menu di Sistema
+-Name[ja]=システムメニュー
+-Name[km]=ប្រព័ន្ធម៉ឺនុយ
+-Name[lt]=Sistemos meniu
+-Name[mk]=Системско мени
+-Name[nb]=Systemmeny
+-Name[nds]=Systeem-Menü
+-Name[nl]=Systeemmenu
+-Name[nn]=Systemmeny
+-Name[pa]=ਸਿਸਟਮ ਮੇਨੂ
+-Name[pl]=System
+-Name[pt]=Menu do Sistema
+-Name[pt_BR]=Menu Sistema
+-Name[ru]=Система
+-Name[se]=Vuogádatfállu
+-Name[sl]=Sistem
+-Name[sr]=Системски мени
+-Name[sr@Latn]=Sistemski meni
+-Name[sv]=Systemmeny
+-Name[tg]=Менюи система
+-Name[th]=เมนูระบบ
+-Name[tr]=Sistem Menüsü
+-Name[uk]=Системне меню
+-Name[uz]=Тизим менюси
+-Name[zh_CN]=系统菜单
+-Name[zh_TW]=系統選單
++Name=My System
+ Comment=Menu of important system places
+ Comment[af]=Kieslys vir belangrike stelsel plekke
+ Comment[bg]=Меню за достъп до системните директории
++++++ klipper-xfixes.diff ++++++
++++ 1565 lines (skipped)
++++ between KDE/kdebase3/klipper-xfixes.diff
++++ and STABLE/kdebase3/klipper-xfixes.diff
++++++ klipperrc.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,20 +1,20 @@
--- klipper/klipperrc.desktop
-+++ klipper/klipperrc.desktop 2004/03/27 10:23:18
-@@ -186,7 +186,7 @@
++++ klipper/klipperrc.desktop
+@@ -209,7 +209,7 @@
Regexp=^https?://.
[Action_1/Command_0]
-Commandline=kfmclient exec %s
+Commandline=kfmclient openURL %s
Description=Open with &Konqueror
- Description[af]=Open met Konqueror
- Description[az]=&Konqueror ilə Aç
-@@ -1365,7 +1365,7 @@
+ Description[af]=Maak oop met Konqueror
+ Description[ar]=فتح ب&كونكيورر
+@@ -1496,7 +1496,7 @@
Regexp=^ftp://.
[Action_6/Command_0]
-Commandline=kfmclient exec %s
+Commandline=kfmclient openURL %s
Description=Open with &Konqueror
- Description[af]=Open met Konqueror
- Description[az]=&Konqueror ilə Aç
+ Description[af]=Maak oop met Konqueror
+ Description[ar]=فتح ب&كونكيورر
++++++ kmenu-search-fs20050503-fixed.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,5 +1,25 @@
---- kicker/kicker/ui/clicklineedit.cpp.sav 2005-08-09 17:16:11.000000000 +0200
-+++ kicker/kicker/ui/clicklineedit.cpp 2005-08-11 16:20:17.000000000 +0200
+--- kicker/kicker/ui/Makefile.am
++++ kicker/kicker/ui/Makefile.am
+@@ -13,7 +13,7 @@
+ recentapps.cpp browser_dlg.cpp \
+ removeapplet_mnu.cpp removeextension_mnu.cpp removecontainer_mnu.cpp \
+ removebutton_mnu.cpp popupmenutitle.cpp hidebutton.cpp \
+- addappletvisualfeedback.cpp
++ addappletvisualfeedback.cpp clicklineedit.cpp
+
+ libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kdmlib/libdmctl.la
+
+@@ -25,7 +25,7 @@
+ addextension_mnu.h extensionop_mnu.h \
+ recentapps.h browser_dlg.h \
+ removeapplet_mnu.h removeextension_mnu.h removecontainer_mnu.h \
+- removebutton_mnu.h popupmenutitle.h hidebutton.h addappletvisualfeedback.h
++ removebutton_mnu.h popupmenutitle.h hidebutton.h addappletvisualfeedback.h clicklineedit.h
+
+ removecontainer_mnu.lo: ../../libkicker/kickerSettings.h
+ removeextension_mnu.lo: ../../libkicker/kickerSettings.h
+--- kicker/kicker/ui/clicklineedit.cpp
++++ kicker/kicker/ui/clicklineedit.cpp
@@ -0,0 +1,85 @@
+/*
+ This file is part of libkdepim.
@@ -86,8 +106,8 @@
+}
+
+#include "clicklineedit.moc"
---- kicker/kicker/ui/clicklineedit.h.sav 2005-08-09 17:16:11.000000000 +0200
-+++ kicker/kicker/ui/clicklineedit.h 2005-08-11 16:20:17.000000000 +0200
+--- kicker/kicker/ui/clicklineedit.h
++++ kicker/kicker/ui/clicklineedit.h
@@ -0,0 +1,63 @@
+/*
+ This file is part of libkdepim.
@@ -337,37 +357,17 @@
};
#endif
---- kicker/kicker/ui/Makefile.am
-+++ kicker/kicker/ui/Makefile.am
-@@ -13,7 +13,7 @@
- recentapps.cpp browser_dlg.cpp \
- removeapplet_mnu.cpp removeextension_mnu.cpp removecontainer_mnu.cpp \
- removebutton_mnu.cpp popupmenutitle.cpp hidebutton.cpp \
-- addappletvisualfeedback.cpp
-+ addappletvisualfeedback.cpp clicklineedit.cpp
-
- libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kdmlib/libdmctl.la
-
-@@ -25,7 +25,7 @@
- addextension_mnu.h extensionop_mnu.h \
- recentapps.h browser_dlg.h \
- removeapplet_mnu.h removeextension_mnu.h removecontainer_mnu.h \
-- removebutton_mnu.h popupmenutitle.h hidebutton.h addappletvisualfeedback.h
-+ removebutton_mnu.h popupmenutitle.h hidebutton.h addappletvisualfeedback.h clicklineedit.h
-
- removecontainer_mnu.lo: ../../libkicker/kickerSettings.h
- removeextension_mnu.lo: ../../libkicker/kickerSettings.h
--- kicker/kicker/ui/service_mnu.cpp
+++ kicker/kicker/ui/service_mnu.cpp
-@@ -25,6 +25,7 @@
- #include
+@@ -26,6 +26,7 @@
+ #include
#include
#include
+#include
#include
#include
-@@ -99,6 +100,8 @@
+@@ -100,6 +101,8 @@
clear();
clearSubmenus();
@@ -376,7 +376,7 @@
doInitialize();
}
-@@ -262,6 +265,10 @@
+@@ -292,6 +295,10 @@
int newId = insertItem(iconset, groupCaption, m, id++);
entryMap_.insert(newId, static_cast(g));
@@ -387,7 +387,7 @@
// We have to delete the sub menu our selves! (See Qt docs.)
subMenus.append(m);
}
-@@ -274,6 +281,7 @@
+@@ -304,6 +311,7 @@
}
KService::Ptr s(static_cast(e));
@@ -395,7 +395,7 @@
insertMenuItem(s, id++, -1, &suppressGenericNames, QString::null, specialTitle[s->name()], categoryIcon[s->name()] );
}
else if (e->isType(KST_KServiceSeparator))
-@@ -871,6 +879,8 @@
+@@ -921,6 +929,8 @@
delete *it;
}
subMenus.clear();
@@ -404,7 +404,7 @@
}
void PanelServiceMenu::selectFirstItem()
-@@ -895,3 +905,72 @@
+@@ -945,3 +955,72 @@
RecentlyLaunchedApps::the().m_bNeedToUpdate = true;
}
++++++ kmenu-search-slowdown-fix.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,5 +1,15 @@
---- kicker/kicker/ui/service_mnu.cpp 2005/11/25 08:19:25 1.115
-+++ kicker/kicker/ui/service_mnu.cpp 2005/11/25 10:32:36
+--- kicker/kicker/ui/k_mnu.cpp
++++ kicker/kicker/ui/k_mnu.cpp
+@@ -775,6 +775,7 @@
+ insertSeparator(RecentlyLaunchedApps::the().m_nNumMenuItems);
+ }
+ }
++ iconsLoaded_ = false;
+ }
+
+ void PanelKMenu::clearRecentMenuItems()
+--- kicker/kicker/ui/service_mnu.cpp
++++ kicker/kicker/ui/service_mnu.cpp
@@ -63,13 +63,20 @@
insertInlineHeader_( insertInlineHeader ),
clearOnClose_(false),
@@ -22,7 +32,7 @@
}
PanelServiceMenu::~PanelServiceMenu()
-@@ -103,6 +112,7 @@
+@@ -103,6 +110,7 @@
clearSubmenus();
searchSubMenuIDs.clear();
searchMenuItems.clear();
@@ -30,7 +40,7 @@
doInitialize();
}
-@@ -258,15 +268,13 @@
+@@ -285,15 +293,13 @@
newSubMenu(g->name(), g->relPath(), this, g->name().utf8(), inlineHeaderName);
m->setCaption(groupCaption);
@@ -47,7 +57,7 @@
entryMap_.insert(newId, static_cast(g));
// This submenu will be searched when applying a search string
searchSubMenuIDs[m] = newId;
-@@ -415,18 +423,20 @@
+@@ -430,18 +436,20 @@
}
}
@@ -74,7 +84,7 @@
deinitialize();
}
-@@ -483,9 +493,9 @@
+@@ -498,9 +506,9 @@
int newId;
if ( label.isEmpty() )
@@ -86,7 +96,7 @@
entryMap_.insert(newId, static_cast(s));
}
-@@ -1009,3 +1019,23 @@
+@@ -1024,3 +1032,23 @@
{
return hasSearchResults_;
}
@@ -110,8 +120,8 @@
+ iconsLoaded_ = true;
+ }
+}
---- kicker/kicker/ui/service_mnu.h 2005/11/25 08:18:55 1.85
-+++ kicker/kicker/ui/service_mnu.h 2005/11/25 10:34:47
+--- kicker/kicker/ui/service_mnu.h
++++ kicker/kicker/ui/service_mnu.h
@@ -125,9 +125,12 @@
PanelServiceMenuMap searchSubMenuIDs;
bool hasSearchResults_;
@@ -125,13 +135,3 @@
private:
enum ContextMenuEntry { AddItemToPanel, EditItem, AddMenuToPanel, EditMenu,
---- kicker/kicker/ui/k_mnu.cpp 2005/11/25 08:18:55 1.85
-+++ kicker/kicker/ui/k_mnu.cpp 2005/11/25 10:33:46
-@@ -775,6 +775,7 @@
- insertSeparator(RecentlyLaunchedApps::the().m_nNumMenuItems);
- }
- }
-+ iconsLoaded_ = false;
- }
-
- void PanelKMenu::clearRecentMenuItems()
++++++ konsole-history-saving.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,7 @@
Index: konsole/TEScreen.cpp
-===================================================================
---- konsole/konsole/TEScreen.cpp (revision 506645)
-+++ konsole/konsole/TEScreen.cpp (working copy)
+================================================================================
+--- konsole/konsole/TEScreen.cpp
++++ konsole/konsole/TEScreen.cpp
@@ -1469,8 +1469,9 @@
sel_begin = 0;
sel_BR = sel_begin;
++++++ konsole-save-session-crash.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,5 +1,5 @@
---- konsole/konsole/konsole.cpp 2006/04/03 16:14:20 1.3
-+++ konsole/konsole/konsole.cpp 2006/04/03 16:53:56
+--- konsole/konsole/konsole.cpp
++++ konsole/konsole/konsole.cpp
@@ -214,6 +214,7 @@
,selectScrollbar(0)
,selectTabbar(0)
++++++ konsole_keytab.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,11 +1,8 @@
Index: konsole/other/x11r5.keytab
-===================================================================
-RCS file: /home/kde/kdebase/konsole/other/x11r5.keytab,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 x11r5.keytab
---- konsole/other/x11r5.keytab 2001/05/27 02:34:03 1.3
-+++ konsole/other/x11r5.keytab 2001/09/23 11:17:23
-@@ -33,10 +33,10 @@ key Left -Shift : "\EOD"
+================================================================================
+--- konsole/other/x11r5.keytab
++++ konsole/other/x11r5.keytab
+@@ -32,10 +32,10 @@
key Enter : "\r"
++++++ kscreensaver-random-NG.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,25 @@
Index: kscreensaver/random.cpp
-===================================================================
---- kscreensaver/random.cpp (Revision 453232)
-+++ kscreensaver/random.cpp (Arbeitskopie)
+================================================================================
+--- kscreensaver/Makefile.am
++++ kscreensaver/Makefile.am
+@@ -3,13 +3,13 @@
+
+ AM_CPPFLAGS = -UQT_NO_ASCII_CAST
+
+-INCLUDES = $(all_includes)
++INCLUDES = $(GLINC) $(all_includes)
+ AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+ bin_PROGRAMS = krandom.kss kblankscrn.kss
+
+ krandom_kss_SOURCES = random.cpp
+-krandom_kss_LDADD = $(LIB_KDEUI) -lm
++krandom_kss_LDADD = $(LIB_KDEUI) $(GLLIB) -lm
+
+ kblankscrn_kss_SOURCES = blankscrn.cpp
+ kblankscrn_kss_LDADD = $(LIB_KDEUI) -lkscreensaver -lm
+--- kscreensaver/random.cpp
++++ kscreensaver/random.cpp
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+ //-----------------------------------------------------------------------------
@@ -153,23 +171,3 @@
manipulateScreen->setChecked(config.readBoolEntry("ManipulateScreen", true));
}
-Index: kscreensaver/Makefile.am
-===================================================================
---- kscreensaver/Makefile.am (Revision 453232)
-+++ kscreensaver/Makefile.am (Arbeitskopie)
-@@ -3,13 +3,13 @@
-
- AM_CPPFLAGS = -UQT_NO_ASCII_CAST
-
--INCLUDES = $(all_includes)
-+INCLUDES = $(GLINC) $(all_includes)
- AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-
- bin_PROGRAMS = krandom.kss kblankscrn.kss
-
- krandom_kss_SOURCES = random.cpp
--krandom_kss_LDADD = $(LIB_KDEUI) -lm
-+krandom_kss_LDADD = $(LIB_KDEUI) $(GLLIB) -lm
-
- kblankscrn_kss_SOURCES = blankscrn.cpp
- kblankscrn_kss_LDADD = $(LIB_KDEUI) -lkscreensaver -lm
++++++ ksmserver-defaulttohalt.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,11 +1,8 @@
Index: ksmserver/shutdown.cpp
-===================================================================
-RCS file: /home/kde/kdebase/ksmserver/shutdown.cpp,v
-retrieving revision 1.51
-diff -u -3 -p -u -r1.51 shutdown.cpp
---- ksmserver/shutdowndlg.cpp 15 Aug 2004 13:54:23 -0000 1.51
-+++ ksmserver/shutdowndlg.cpp 4 Jan 2005 13:41:56 -0000
-@@ -124,7 +124,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
+================================================================================
+--- ksmserver/shutdowndlg.cpp
++++ ksmserver/shutdowndlg.cpp
+@@ -201,7 +201,7 @@
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
++++++ ksmserver-suspend.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,5 @@
-diff -ru ksmserver-1/Makefile.am ksmserver/Makefile.am
---- ksmserver-1/Makefile.am 2005-11-22 17:09:38.000000000 +0100
-+++ ksmserver/Makefile.am 2005-11-22 20:33:47.000000000 +0100
+--- ksmserver/Makefile.am
++++ ksmserver/Makefile.am
@@ -17,7 +17,7 @@
SUBDIRS = .
@@ -28,9 +27,8 @@
messages:
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
-diff -ru ksmserver-1/shutdowndlg.cpp ksmserver/shutdowndlg.cpp
---- ksmserver-1/shutdowndlg.cpp 2005-11-22 20:21:04.000000000 +0100
-+++ ksmserver/shutdowndlg.cpp 2005-11-22 20:36:25.000000000 +0100
+--- ksmserver/shutdowndlg.cpp
++++ ksmserver/shutdowndlg.cpp
@@ -37,12 +37,15 @@
#include
#include
@@ -47,7 +45,7 @@
#include
-@@ -228,8 +231,55 @@
+@@ -233,8 +236,55 @@
connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) );
} else
QToolTip::add( btnReboot, i18n( "<qt><h3>Restart Computer</h3><p>Log out of the current session and restart the computer</p></qt>" ) );
@@ -104,7 +102,7 @@
buttonlay->addStretch( 1 );
// Separator
-@@ -242,6 +292,41 @@
+@@ -247,6 +297,41 @@
}
@@ -146,11 +144,8 @@
void KSMShutdownDlg::slotLogout()
{
-Nur in ksmserver: shutdowndlg.cpp.orig.
-Nur in ksmserver: shutdowndlg.cpp.rej.
-diff -ru ksmserver-1/shutdowndlg.h ksmserver/shutdowndlg.h
---- ksmserver-1/shutdowndlg.h 2005-11-22 18:29:49.000000000 +0100
-+++ ksmserver/shutdowndlg.h 2005-11-22 20:33:47.000000000 +0100
+--- ksmserver/shutdowndlg.h
++++ ksmserver/shutdowndlg.h
@@ -59,6 +59,8 @@
void slotHalt();
void slotReboot();
@@ -168,4 +163,3 @@
};
class KSMDelayedPushButton : public KPushButton
-Nur in ksmserver: shutdowndlg.h.orig.
++++++ ksmserver-tooltips.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,6 @@
-diff -ru ksmserver.orig/shutdowndlg.cpp ksmserver/shutdowndlg.cpp
---- ksmserver.orig/shutdowndlg.cpp 2005-11-22 17:09:38.000000000 +0100
-+++ ksmserver/shutdowndlg.cpp 2005-11-22 17:22:02.000000000 +0100
-@@ -115,6 +123,7 @@
+--- ksmserver/shutdowndlg.cpp
++++ ksmserver/shutdowndlg.cpp
+@@ -123,6 +123,7 @@
// End session
KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End Current Session"), "undo"), frame );
@@ -9,7 +8,7 @@
QFont btnFont = btnLogout->font();
buttonlay->addWidget( btnLogout );
connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout()));
-@@ -123,6 +132,7 @@
+@@ -131,6 +132,7 @@
// Shutdown
KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit"), frame );
@@ -17,7 +16,7 @@
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
-@@ -131,6 +141,7 @@
+@@ -139,6 +141,7 @@
// Reboot
KSMDelayedPushButton* btnReboot = new KSMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload"), frame );
@@ -25,7 +24,7 @@
btnReboot->setFont( btnFont );
buttonlay->addWidget( btnReboot );
-@@ -155,7 +166,8 @@
+@@ -163,7 +166,8 @@
btnReboot->setPopup(targets);
connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) );
@@ -35,4 +34,3 @@
}
buttonlay->addStretch( 1 );
-
++++++ ksplashml.patch ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,6 @@
---- ksplashml/kcmksplash/installer.cpp.sav 2005-03-08 14:36:02.000000000 +0100
-+++ ksplashml/kcmksplash/installer.cpp 2005-03-08 17:23:10.131393250 +0100
-@@ -469,6 +469,14 @@ void SplashInstaller::slotTest()
+--- ksplashml/kcmksplash/installer.cpp
++++ ksplashml/kcmksplash/installer.cpp
+@@ -469,6 +469,14 @@
KMessageBox::error(this,i18n("Unable to start ksplashsimple."));
return;
}
++++++ ksysguard-kill-fix.patch ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,6 @@
---- ksysguard/gui/SensorDisplayLib/ProcessList.cc.sav 2005-09-29 21:34:40.000000000 +0200
-+++ ksysguard/gui/SensorDisplayLib/ProcessList.cc 2006-02-20 15:08:49.000000000 +0100
-@@ -272,11 +272,10 @@ const QValueList<int>&
+--- ksysguard/gui/SensorDisplayLib/ProcessList.cc
++++ ksysguard/gui/SensorDisplayLib/ProcessList.cc
+@@ -272,11 +272,10 @@
ProcessList::getSelectedPIds()
{
selectedPIds.clear();
@@ -15,7 +15,7 @@
return (selectedPIds);
}
-@@ -285,14 +284,13 @@ const QStringList&
+@@ -285,14 +284,13 @@
ProcessList::getSelectedAsStrings()
{
selectedAsStrings.clear();
@@ -36,7 +36,7 @@
return (selectedAsStrings);
}
-@@ -868,14 +866,12 @@ ProcessList::handleRMBPressed(QListViewI
+@@ -868,14 +866,12 @@
/* we go through list to get all task also
when update interval is paused */
selectedPIds.clear();
++++++ ksysguard-slp-ratelimit.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,6 @@
--- ksysguard/gui/ksysguard.cc
+++ ksysguard/gui/ksysguard.cc
-@@ -394,7 +394,11 @@
+@@ -407,7 +407,11 @@
}
#if HAVE_SLP
++++++ ksysguardd-openslp.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,7 @@
--- ksysguard/configure.in.in
-+++ ksysguard/configure.in.in 2004/08/06 12:24:20
-@@ -26,6 +26,35 @@
- KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
++++ ksysguard/configure.in.in
+@@ -45,5 +45,34 @@
+ AC_SUBST(LIBHOSTS)
AC_SUBST(LIBSENSORS)
+# check for SLP
@@ -35,9 +35,8 @@
+
dnl Check for dell laptop support
AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
-
--- ksysguard/example/ksysguarddrc
-+++ ksysguard/example/ksysguarddrc 2004/08/06 12:24:20
++++ ksysguard/example/ksysguarddrc
@@ -1,5 +1,8 @@
# /etc/ksysguardd.conf
@@ -48,7 +47,7 @@
LogFiles=messages:/var/log/messages,kern:/var/log/kern.log,daemon:/var/log/daemon.log
--- ksysguard/gui/Makefile.am
-+++ ksysguard/gui/Makefile.am 2004/08/06 12:24:20
++++ ksysguard/gui/Makefile.am
@@ -31,7 +31,7 @@
ksysguard_LDADD = \
ksgrd/libksgrd.la \
@@ -59,7 +58,7 @@
kpm_SOURCES = kpm.c
--- ksysguard/gui/ksysguard.cc
-+++ ksysguard/gui/ksysguard.cc 2004/08/06 12:27:33
++++ ksysguard/gui/ksysguard.cc
@@ -34,6 +34,8 @@
#include
#include
@@ -68,8 +67,8 @@
+
#include
#include
- #include
-@@ -269,6 +271,46 @@
+ #include
+@@ -280,6 +282,46 @@
mSplitter->setSizes( sizes );
}
@@ -116,9 +115,9 @@
void TopLevel::initStatusBar()
{
KSGRD::SensorMgr->engage( "localhost", "", "ksysguardd" );
-@@ -350,6 +392,10 @@
- KSGRD::SensorMgr->sendRequest( "localhost", "mem/swap/free",
- (KSGRD::SensorClient*)this, 3 );
+@@ -363,6 +405,10 @@
+ KSGRD::SensorMgr->sendRequest( "localhost", "mem/swap/used",
+ (KSGRD::SensorClient*)this, 4 );
}
+
+#if HAVE_SLP
@@ -128,7 +127,7 @@
bool TopLevel::queryClose()
--- ksysguard/gui/ksysguard.h
-+++ ksysguard/gui/ksysguard.h 2004/08/06 12:24:20
++++ ksysguard/gui/ksysguard.h
@@ -24,6 +24,8 @@
#ifndef KSG_KSYSGUARD_H
#define KSG_KSYSGUARD_H
@@ -138,7 +137,7 @@
#include
#include
-@@ -33,6 +35,10 @@
+@@ -34,6 +36,10 @@
#include
@@ -149,7 +148,7 @@
class KRecentFilesAction;
class KToggleAction;
-@@ -76,6 +82,9 @@
+@@ -77,6 +83,9 @@
virtual void customEvent( QCustomEvent* );
virtual void timerEvent( QTimerEvent* );
virtual bool queryClose();
@@ -169,8 +168,8 @@
+ksysguardd_LDFLAGS = $(all_libraries) $(LIB_SLP)
ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -lkdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD)
--- ksysguard/ksysguardd/conf.c
-+++ ksysguard/ksysguardd/conf.c 2004/08/06 12:24:20
-@@ -55,6 +55,7 @@
++++ ksysguard/ksysguardd/conf.c
+@@ -56,6 +56,7 @@
char *begin, *token, *tmp;
ConfigLogFile *confLog;
@@ -178,7 +177,7 @@
LogFileList = new_ctnr();
SensorList = new_ctnr();
-@@ -92,6 +93,10 @@
+@@ -93,6 +94,10 @@
if ( line[ strlen( line ) - 1 ] == '\n' )
line[ strlen( line ) - 1 ] = '\0';
@@ -187,13 +186,13 @@
+ };
+
if ( !strncmp( line, "RegisterDomain",14) && (begin = strchr( line, '=' )) ) RegisterDomain=strdup(begin+1);
-
+
if ( !strncmp( line, "LogFiles", 8 ) && (begin = strchr( line, '=' )) ) {
--- ksysguard/ksysguardd/conf.h
-+++ ksysguard/ksysguardd/conf.h 2004/08/06 12:24:20
-@@ -28,6 +28,8 @@
- char *path;
- } ConfigLogFile;
++++ ksysguard/ksysguardd/conf.h
+@@ -30,6 +30,8 @@
+
+ extern char* RegisterDomain;
+short confSLPrefresh;
+
@@ -213,7 +212,7 @@
#include "modules.h"
#include "ksysguardd.h"
-@@ -348,6 +352,62 @@
+@@ -344,6 +348,62 @@
#endif
@@ -276,8 +275,8 @@
int createServerSocket()
{
int i = 1;
-@@ -400,6 +460,10 @@
- RegisterDomain : "local.",NULL, htons(SocketPort), 0, 0, publish_callback, 0);
+@@ -398,6 +458,10 @@
+ ServiceSocket = DNSServiceRefSockFD(Ref);
#endif
+#if HAVE_SLP
++++++ kth_keyboard.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,7 @@
Index: kthememanager.cpp
-===================================================================
---- kcontrol/kthememanager/kthememanager.cpp (revision 510485)
-+++ kcontrol/kthememanager/kthememanager.cpp (revision 510486)
+================================================================================
+--- kcontrol/kthememanager/kthememanager.cpp
++++ kcontrol/kthememanager/kthememanager.cpp
@@ -49,7 +49,7 @@
KAboutData *about = new KAboutData("kthememanager", I18N_NOOP("KDE Theme Manager"),
"0.4", I18N_NOOP("This control module handles installing, removing and "
@@ -38,4 +38,4 @@
+ QString themeDir = KGlobal::dirs()->findResourceDir( "themes", themeName + "/" + themeName + ".xml") + themeName + "/";
QString pixFile = themeDir + themeName + ".preview.png";
-
\ No newline at end of file
+
++++++ kwin-firefox-focus.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,33 +1,5 @@
---- kwin/kcmkwin/kwinrules/main.cpp.sav 2006-01-04 14:58:48.000000000 +0100
-+++ kwin/kcmkwin/kwinrules/main.cpp 2006-02-06 21:32:31.000000000 +0100
-@@ -50,6 +50,11 @@
- static void saveRules( const QValueList< Rules* >& rules )
- {
- KConfig cfg( "kwinrulesrc" );
-+ QStringList groups = cfg.groupList();
-+ for( QStringList::ConstIterator it = groups.begin();
-+ it != groups.end();
-+ ++it )
-+ cfg.deleteGroup( *it );
- cfg.setGroup( "General" );
- cfg.writeEntry( "count", rules.count());
- int i = 1;
---- kwin/kcmkwin/kwinrules/ruleslist.cpp.sav 2006-01-04 14:58:48.000000000 +0100
-+++ kwin/kcmkwin/kwinrules/ruleslist.cpp 2006-02-06 21:32:31.000000000 +0100
-@@ -172,6 +172,11 @@
- void KCMRulesList::save()
- {
- KConfig cfg( "kwinrulesrc" );
-+ QStringList groups = cfg.groupList();
-+ for( QStringList::ConstIterator it = groups.begin();
-+ it != groups.end();
-+ ++it )
-+ cfg.deleteGroup( *it );
- cfg.setGroup( "General" );
- cfg.writeEntry( "count", rules.count());
- int i = 1;
---- kwin/data/Makefile.am.sav 2005-05-04 17:02:44.000000000 +0200
-+++ kwin/data/Makefile.am 2006-02-06 21:32:25.000000000 +0100
+--- kwin/data/Makefile.am
++++ kwin/data/Makefile.am
@@ -1,11 +1,14 @@
-kconf_PROGRAMS = kwin_update_window_settings
+kconf_PROGRAMS = kwin_update_window_settings kwin_update_default_rules
@@ -57,8 +29,56 @@
+
+kwin_default_rules_DATA = fsp_workarounds_1
+kwin_default_rulesdir = $(kde_datadir)/kwin/default_rules
---- kwin/data/update_default_rules.cpp.sav 2006-02-06 21:32:25.000000000 +0100
-+++ kwin/data/update_default_rules.cpp 2006-02-06 21:32:25.000000000 +0100
+--- kwin/data/fsp_workarounds_1
++++ kwin/data/fsp_workarounds_1
+@@ -0,0 +1,34 @@
++[1]
++description=(Default) Disable focus stealing prevention for OpenOffice.org 2.0
++fsplevel=0
++fsplevelrule=2
++wmclass=vclsalframe openoffice.org 2.0
++wmclasscomplete=true
++wmclassmatch=1
++
++[2]
++description=(Default) Disable focus stealing prevention for Mozilla
++fsplevel=0
++fsplevelrule=2
++wmclass=mozilla-bin
++wmclasscomplete=false
++wmclassmatch=1
++
++[3]
++description=(Default) Disable focus stealing prevention for Firefox
++fsplevel=0
++fsplevelrule=2
++wmclass=firefox-bin
++wmclasscomplete=false
++wmclassmatch=1
++
++[4]
++description=(Default) Disable focus stealing prevention for Thunderbird
++fsplevel=0
++fsplevelrule=2
++wmclass=thunderbird-bin
++wmclasscomplete=false
++wmclassmatch=1
++
++[5]
++description=(Default) Disable focus stealing prevention for XV
+--- kwin/data/kwin_fsp_workarounds_1.upd
++++ kwin/data/kwin_fsp_workarounds_1.upd
+@@ -0,0 +1,8 @@
++Id=kde351
++# the file is intentionally a dummy, as the binary will update kwinrulesrc,
++# file kwinrules_update will just remember it has been done
++File=kwinrules_update
++Group=Dummy
++Options=overwrite
++ScriptArguments=fsp_workarounds_1
++Script=kwin_update_default_rules
+--- kwin/data/update_default_rules.cpp
++++ kwin/data/update_default_rules.cpp
@@ -0,0 +1,56 @@
+/*****************************************************************
+ KWin - the KDE window manager
@@ -116,64 +136,36 @@
+ client.attach();
+ client.send("kwin*", "", "reconfigure()", "");
+ }
---- kwin/data/fsp_workarounds_1.sav 2006-02-06 21:32:25.000000000 +0100
-+++ kwin/data/fsp_workarounds_1 2006-02-06 21:32:25.000000000 +0100
-@@ -0,0 +1,34 @@
-+[1]
-+description=(Default) Disable focus stealing prevention for OpenOffice.org 2.0
-+fsplevel=0
-+fsplevelrule=2
-+wmclass=vclsalframe openoffice.org 2.0
-+wmclasscomplete=true
-+wmclassmatch=1
-+
-+[2]
-+description=(Default) Disable focus stealing prevention for Mozilla
-+fsplevel=0
-+fsplevelrule=2
-+wmclass=mozilla-bin
-+wmclasscomplete=false
-+wmclassmatch=1
-+
-+[3]
-+description=(Default) Disable focus stealing prevention for Firefox
-+fsplevel=0
-+fsplevelrule=2
-+wmclass=firefox-bin
-+wmclasscomplete=false
-+wmclassmatch=1
-+
-+[4]
-+description=(Default) Disable focus stealing prevention for Thunderbird
-+fsplevel=0
-+fsplevelrule=2
-+wmclass=thunderbird-bin
-+wmclasscomplete=false
-+wmclassmatch=1
-+
-+[5]
-+description=(Default) Disable focus stealing prevention for XV
-+fsplevel=0
-+fsplevelrule=2
-+wmclass=^xv .*
-+wmclasscomplete=true
-+wmclassmatch=3
-+
-+[General]
-+count=5
---- kwin/data/kwin_fsp_workarounds_1.upd.sav 2006-02-06 21:32:25.000000000 +0100
-+++ kwin/data/kwin_fsp_workarounds_1.upd 2006-02-06 21:32:25.000000000 +0100
-@@ -0,0 +1,8 @@
-+Id=kde351
-+# the file is intentionally a dummy, as the binary will update kwinrulesrc,
-+# file kwinrules_update will just remember it has been done
-+File=kwinrules_update
-+Group=Dummy
-+Options=overwrite
-+ScriptArguments=fsp_workarounds_1
-+Script=kwin_update_default_rules
---- kwin/rules.cpp.sav 2005-11-16 14:04:02.000000000 +0100
-+++ kwin/rules.cpp 2006-02-06 21:32:31.000000000 +0100
+--- kwin/kcmkwin/kwinrules/main.cpp
++++ kwin/kcmkwin/kwinrules/main.cpp
+@@ -50,6 +50,11 @@
+ static void saveRules( const QValueList< Rules* >& rules )
+ {
+ KConfig cfg( "kwinrulesrc" );
++ QStringList groups = cfg.groupList();
++ for( QStringList::ConstIterator it = groups.begin();
++ it != groups.end();
++ ++it )
++ cfg.deleteGroup( *it );
+ cfg.setGroup( "General" );
+ cfg.writeEntry( "count", rules.count());
+ int i = 1;
+--- kwin/kcmkwin/kwinrules/ruleslist.cpp
++++ kwin/kcmkwin/kwinrules/ruleslist.cpp
+@@ -172,6 +172,11 @@
+ void KCMRulesList::save()
+ {
+ KConfig cfg( "kwinrulesrc" );
++ QStringList groups = cfg.groupList();
++ for( QStringList::ConstIterator it = groups.begin();
++ it != groups.end();
++ ++it )
++ cfg.deleteGroup( *it );
+ cfg.setGroup( "General" );
+ cfg.writeEntry( "count", rules.count());
+ int i = 1;
+--- kwin/rules.cpp
++++ kwin/rules.cpp
@@ -973,6 +973,11 @@
{
rulesUpdatedTimer.stop();
++++++ less_verbal_kdesu.patch ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,6 @@
---- kdesu/kdesu/sudlg.cpp.sav 2005-05-05 13:14:55.000000000 +0200
-+++ kdesu/kdesu/sudlg.cpp 2006-01-05 14:04:06.000000000 +0100
-@@ -20,13 +20,9 @@ KDEsuDialog::KDEsuDialog(QCString user,
+--- kdesu/kdesu/sudlg.cpp
++++ kdesu/kdesu/sudlg.cpp
+@@ -20,13 +20,9 @@
QString prompt;
if (m_User == "root")
++++++ libkonq-kdemm.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,7 +1,26 @@
+--- libkonq/Makefile.am
++++ libkonq/Makefile.am
+@@ -53,14 +53,10 @@
+ konq_faviconmgr.h konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h
+
+
+-if include_ARTS
+-ARTS_MODULE = konq_sound.la
+-endif
+-
+-kde_module_LTLIBRARIES = $(ARTS_MODULE)
++kde_module_LTLIBRARIES = konq_sound.la
+ konq_sound_la_SOURCES = konq_sound.cc
+ konq_sound_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-konq_sound_la_LIBADD = -lsoundserver_idl -lartskde
++konq_sound_la_LIBADD = -lkdemm
+
+ noinst_HEADERS = konq_sound.h
+
--- libkonq/konq_sound.cc
-+++ libkonq/konq_sound.cc 2005/04/01 10:15:18
++++ libkonq/konq_sound.cc
@@ -16,10 +16,9 @@
- Boston, MA 02111-1307, USA.
+ Boston, MA 02110-1301, USA.
*/
-#include
@@ -91,22 +110,3 @@
}
class KonqSoundFactory : public KLibFactory
---- libkonq/Makefile.am
-+++ libkonq/Makefile.am 2005/04/01 10:17:05
-@@ -53,14 +53,10 @@
- konq_faviconmgr.h konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h
-
-
--if include_ARTS
--ARTS_MODULE = konq_sound.la
--endif
--
--kde_module_LTLIBRARIES = $(ARTS_MODULE)
-+kde_module_LTLIBRARIES = konq_sound.la
- konq_sound_la_SOURCES = konq_sound.cc
- konq_sound_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
--konq_sound_la_LIBADD = -lsoundserver_idl -lartskde
-+konq_sound_la_LIBADD = -lkdemm
-
- noinst_HEADERS = konq_sound.h
-
++++++ locale-dont-show-flag.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,6 @@
---- kcontrol/locale/kcmlocale.cpp.sav 2005-07-18 17:04:53.000000000 +0200
-+++ kcontrol/locale/kcmlocale.cpp 2005-08-09 14:22:37.000000000 +0200
-@@ -292,9 +292,13 @@ void KLocaleConfig::loadCountryList()
+--- kcontrol/locale/kcmlocale.cpp
++++ kcontrol/locale/kcmlocale.cpp
+@@ -292,9 +292,13 @@
QString map( locate( "locale",
QString::fromLatin1( "l10n/%1.png" )
.arg(tag) ) );
@@ -14,7 +14,7 @@
m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
}
-@@ -318,10 +322,14 @@ void KLocaleConfig::loadCountryList()
+@@ -318,10 +322,14 @@
tag = tag.mid(index + 1);
int menu_index = submenu.isEmpty() ? -1 : -2;
++++++ mach_blass.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:11.000000000 +0200
@@ -1,6 +1,5 @@
-diff -ru ksmserver-tt/shutdowndlg.cpp ksmserver/shutdowndlg.cpp
---- ksmserver-tt/shutdowndlg.cpp 2005-11-22 17:22:02.000000000 +0100
-+++ ksmserver/shutdowndlg.cpp 2005-11-22 20:21:04.000000000 +0100
+--- ksmserver/shutdowndlg.cpp
++++ ksmserver/shutdowndlg.cpp
@@ -34,6 +34,7 @@
#include
#include
@@ -19,7 +18,7 @@
KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L;
KSMShutdownFeedback::KSMShutdownFeedback()
-@@ -54,31 +58,87 @@
+@@ -54,31 +58,92 @@
m_currentY( 0 )
{
setBackgroundMode( QWidget::NoBackground );
@@ -44,23 +43,10 @@
+ passed.start();
+
if ( m_currentY >= height() ) {
-- if ( backgroundMode() == QWidget::NoBackground ) {
-- setBackgroundMode( QWidget::NoBackground );
-- setBackgroundPixmap( m_root );
-- }
+ slotPaintEffect();
- return;
- }
-
-- KPixmap pixmap;
-- pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 );
-- pixmap = KPixmapEffect::fade( pixmap, 0.4, Qt::black );
-- pixmap = KPixmapEffect::toGray( pixmap, true );
-- bitBlt( this, 0, m_currentY, &pixmap );
-- bitBlt( &m_root, 0, m_currentY, &pixmap );
-- m_currentY += 10;
-- QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) );
--}
++ return;
++ }
++
+ QImage img;
+ img = QPixmap::grabWindow( qt_xrootwin(), 0,
+ m_currentY, width(),
@@ -116,18 +102,31 @@
+ bitBlt( this, 0, 0, ©);
+ //kdDebug() << "passed after bitBlt " << passed.elapsed() << endl;
+
-+ if ( current_fade >= scale )
-+ return;
-+
++ if ( current_fade >= scale ) {
+ if ( backgroundMode() == QWidget::NoBackground ) {
+ setBackgroundMode( QWidget::NoBackground );
+- setBackgroundPixmap( m_root );
++ setBackgroundPixmap( copy );
+ }
+ return;
+ }
+
+- KPixmap pixmap;
+- pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 );
+- pixmap = KPixmapEffect::fade( pixmap, 0.4, Qt::black );
+- pixmap = KPixmapEffect::toGray( pixmap, true );
+- bitBlt( this, 0, m_currentY, &pixmap );
+- bitBlt( &m_root, 0, m_currentY, &pixmap );
+- m_currentY += 10;
+- QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) );
+-}
+ QTimer::singleShot( 0, this, SLOT( slotPaintEffect() ) );
+ }
//////
-Nur in ksmserver: shutdowndlg.cpp.orig.
-diff -ru ksmserver-tt/shutdowndlg.h ksmserver/shutdowndlg.h
---- ksmserver-tt/shutdowndlg.h 2005-11-22 17:14:12.000000000 +0100
-+++ ksmserver/shutdowndlg.h 2005-11-22 18:29:49.000000000 +0100
+--- ksmserver/shutdowndlg.h
++++ ksmserver/shutdowndlg.h
@@ -9,7 +9,9 @@
#include
@@ -154,22 +153,3 @@
};
-diff -ru ksmserver-2/shutdowndlg.cpp ksmserver/shutdowndlg.cpp
---- ksmserver-2/shutdowndlg.cpp 2005-11-22 20:36:25.000000000 +0100
-+++ ksmserver/shutdowndlg.cpp 2005-11-23 16:23:49.000000000 +0100
-@@ -137,8 +137,13 @@
- bitBlt( this, 0, 0, ©);
- //kdDebug() << "passed after bitBlt " << passed.elapsed() << endl;
-
-- if ( current_fade >= scale )
-- return;
-+ if ( current_fade >= scale ) {
-+ if ( backgroundMode() == QWidget::NoBackground ) {
-+ setBackgroundMode( QWidget::NoBackground );
-+ setBackgroundPixmap( copy );
-+ }
-+ return;
-+ }
-
- QTimer::singleShot( 0, this, SLOT( slotPaintEffect() ) );
- }
++++++ make-wallpapers-hideable.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,7 +1,7 @@
Index: kcontrol/background/bgdialog.cpp
-===================================================================
---- kcontrol/background/bgdialog.cpp (revision 518219)
-+++ kcontrol/background/bgdialog.cpp (working copy)
+================================================================================
+--- kcontrol/background/bgdialog.cpp
++++ kcontrol/background/bgdialog.cpp
@@ -522,14 +522,23 @@
//search for .desktop files before searching for images without .desktop files
QStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true);
++++++ media-iPod.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,10 +1,7 @@
Index: kioslave/media/kio_media.cpp
-===================================================================
-RCS file: /home/kde/kdebase/kioslave/media/kio_media.cpp,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 kio_media.cpp
---- kioslave/media/kio_media.cpp 16 Nov 2004 02:10:34 -0000 1.4
-+++ kioslave/media/kio_media.cpp 16 Mar 2005 20:18:55 -0000
+================================================================================
+--- kioslave/media/kio_media.cpp
++++ kioslave/media/kio_media.cpp
@@ -24,6 +24,7 @@
#include
#include
@@ -13,7 +10,7 @@
#include
-@@ -230,6 +231,14 @@ void MediaProtocol::listDir(const KURL &
+@@ -232,6 +233,14 @@
return;
}
++++++ media_hal.diff ++++++
++++ 3875 lines (skipped)
++++ between KDE/kdebase3/media_hal.diff
++++ and STABLE/kdebase3/media_hal.diff
++++++ mini-cli-parents.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,6 +1,6 @@
---- kdesktop/desktop.cc.sav 2006-03-06 14:01:25.000000000 +0100
-+++ kdesktop/desktop.cc 2006-03-06 14:01:39.000000000 +0100
-@@ -501,7 +501,7 @@ void KDesktop::popupExecuteCommand(const
+--- kdesktop/desktop.cc
++++ kdesktop/desktop.cc
+@@ -504,7 +504,7 @@
// Created on demand
if ( !m_miniCli )
{
@@ -9,8 +9,8 @@
m_miniCli->adjustSize(); // for the centering below
}
---- kdesktop/minicli.cpp.sav 2006-03-06 14:01:25.000000000 +0100
-+++ kdesktop/minicli.cpp 2006-03-06 14:01:45.000000000 +0100
+--- kdesktop/minicli.cpp
++++ kdesktop/minicli.cpp
@@ -73,7 +73,7 @@
#define KDESU_ERR strerror(errno)
@@ -20,7 +20,7 @@
m_autoCheckedRunInTerm(false)
{
setPlainCaption( i18n("Run Command") );
-@@ -504,7 +504,7 @@ int Minicli::runCommand()
+@@ -514,7 +514,7 @@
case KURIFilterData::HELP:
{
// No need for kfmclient, KRun does it all (David)
@@ -29,7 +29,7 @@
return 0;
}
case KURIFilterData::EXECUTABLE:
-@@ -550,7 +550,7 @@ int Minicli::runCommand()
+@@ -560,7 +560,7 @@
if (service && service->isValid() && service->type() == "Application")
{
notifyServiceStarted(service);
@@ -38,7 +38,7 @@
return 0;
}
-@@ -558,7 +558,7 @@ int Minicli::runCommand()
+@@ -568,7 +568,7 @@
if (service && service->isValid() && service->type() == "Application")
{
notifyServiceStarted(service);
++++++ nsplugin-Preference.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,16 +1,13 @@
Index: nsplugins/pluginscan.cpp
-===================================================================
-RCS file: /home/kde/kdebase/nsplugins/pluginscan.cpp,v
-retrieving revision 1.44
-diff -u -3 -p -r1.44 pluginscan.cpp
---- nsplugins/pluginscan.cpp 4 Oct 2002 22:22:06 -0000 1.44
-+++ nsplugins/pluginscan.cpp 16 Sep 2003 08:31:39 -0000
-@@ -480,7 +480,7 @@ void writeServicesFile( QStringList mime
+================================================================================
+--- nsplugins/pluginscan.cpp
++++ nsplugins/pluginscan.cpp
+@@ -495,7 +495,7 @@
ts << "Icon=netscape" << endl;
ts << "Comment=" << i18n("Netscape plugin viewer") << endl;
ts << "X-KDE-Library=libnsplugin" << endl;
- ts << "InitialPreference=0" << endl;
+ ts << "InitialPreference=7" << endl;
ts << "ServiceTypes=KParts/ReadOnlyPart,Browser/View" << endl;
+ ts << "X-KDE-BrowserView-PluginsInfo=nsplugins/pluginsinfo" << endl;
- if (mimeTypes.count() > 0)
++++++ nsplugin-crash-fix.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,18 +1,5 @@
-------------------------------------------------------------------------
-r506584 | staikos | 2006-02-07 07:10:28 +0100 (Tue, 07 Feb 2006) | 7 lines
-
-fix one of the most common nsplugin crashes remaining. The object was being
-deleted from its own slot via a signal emitted! Any crashes that go through
-#12 0x08060988 in QPtrList<NSPluginStreamBase>::remove ()
-#13 0x08057eff in NSPluginInstance::streamFinished ()
-are most likely this one.
-BUG: 121501
-
-------------------------------------------------------------------------
-Index: nsplugin.cpp
-===================================================================
---- nsplugins/viewer/nsplugin.cpp (revision 506583)
-+++ nsplugins/viewer/nsplugin.cpp (revision 506584)
+--- nsplugins/viewer/nsplugin.cpp
++++ nsplugins/viewer/nsplugin.cpp
@@ -895,7 +895,11 @@
{
kdDebug(1431) << "-> NSPluginInstance::streamFinished" << endl;
++++++ pluginscan-libXt.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,5 +1,5 @@
---- nsplugins/pluginscan.cpp.sav 2006-01-23 14:43:08.000000000 +0100
-+++ nsplugins/pluginscan.cpp 2006-04-21 17:58:27.000000000 +0200
+--- nsplugins/pluginscan.cpp
++++ nsplugins/pluginscan.cpp
@@ -54,6 +54,7 @@
#include
@@ -8,7 +8,7 @@
static int showProgress=0;
-@@ -93,6 +94,16 @@ extern "C" void __pure_virtual()
+@@ -93,6 +94,16 @@
}
#endif
@@ -25,7 +25,7 @@
KConfig *infoConfig = 0;
-@@ -585,6 +596,7 @@ int main( int argc, char **argv )
+@@ -585,6 +596,7 @@
sigaction( SIGCHLD, &act, 0 );
++++++ short-menus.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,5 +1,5 @@
--- kdesktop/Makefile.am
-+++ kdesktop/Makefile.am 2005/02/08 11:08:16
++++ kdesktop/Makefile.am
@@ -6,6 +6,8 @@
SUBDIRS = . lock pics patterns programs init kwebdesktop
@@ -9,22 +9,8 @@
####### Files
bin_PROGRAMS = kcheckrunning
---- kicker/libkicker/kickerSettings.kcfg.sav 2006-02-10 14:55:12.000000000 +0100
-+++ kicker/libkicker/kickerSettings.kcfg 2006-02-10 14:55:19.000000000 +0100
-@@ -126,6 +126,11 @@
- <default>true</default>
- </entry>
-
-+<entry name="ReduceMenuDepth" type="Bool" >
-+ <label>Simplify menus with only a single item inside</label>
-+ <default>false</default>
-+ </entry>
-+
- <entry name="MenuEntryHeight" type="Int" >
- <label>Height of menu entries in pixels</label>
- <default>0</default>
---- kicker/kicker/ui/service_mnu.cpp.sav 2006-02-10 14:55:12.000000000 +0100
-+++ kicker/kicker/ui/service_mnu.cpp 2006-02-10 15:07:24.000000000 +0100
+--- kicker/kicker/ui/service_mnu.cpp
++++ kicker/kicker/ui/service_mnu.cpp
@@ -111,6 +111,11 @@
QStringList suppressGenericNames = _root->suppressGenericNames();
@@ -99,9 +85,9 @@
+
+ _list = _root->SuSEsortEntries( slist, glist, excludeNoDisplay_, true );
+ it = _list.begin();
-+
-+ for (; it != _list.end(); ++it) {
++ for (; it != _list.end(); ++it) {
++
+ KSycocaEntry * e = *it;
+
+ if (e->isType(KST_KServiceGroup)) {
@@ -147,7 +133,7 @@
QString inlineHeaderName = g->showInlineHeader() ? groupCaption : "";
// Item names may contain ampersands. To avoid them being converted
// to accelerators, replace them with two ampersands.
-@@ -214,7 +299,7 @@
+@@ -214,7 +304,7 @@
}
KService::Ptr s(static_cast(e));
@@ -156,7 +142,7 @@
}
else if (e->isType(KST_KServiceSeparator))
{
-@@ -350,7 +435,8 @@
+@@ -350,7 +440,8 @@
void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
int nIndex/*= -1*/,
const QStringList *suppressGenericNames /* = 0 */,
@@ -166,7 +152,7 @@
{
QString serviceName = aliasname.isEmpty() ? s->name():aliasname;
// add comment
-@@ -393,7 +479,15 @@
+@@ -393,7 +484,15 @@
// to accelerators, replace them with two ampersands.
serviceName.replace("&", "&&");
@@ -183,8 +169,8 @@
entryMap_.insert(newId, static_cast(s));
}
---- kicker/kicker/ui/service_mnu.h.sav 2006-02-10 14:55:12.000000000 +0100
-+++ kicker/kicker/ui/service_mnu.h 2006-02-10 14:55:19.000000000 +0100
+--- kicker/kicker/ui/service_mnu.h
++++ kicker/kicker/ui/service_mnu.h
@@ -83,7 +83,8 @@
protected:
void insertMenuItem(KService::Ptr & s, int nId, int nIndex = -1,
@@ -195,3 +181,17 @@
virtual PanelServiceMenu * newSubMenu(const QString & label,
const QString & relPath,
QWidget * parent, const char * name,
+--- kicker/libkicker/kickerSettings.kcfg
++++ kicker/libkicker/kickerSettings.kcfg
+@@ -126,6 +126,11 @@
+ <default>true</default>
+ </entry>
+
++<entry name="ReduceMenuDepth" type="Bool" >
++ <label>Simplify menus with only a single item inside</label>
++ <default>false</default>
++ </entry>
++
+ <entry name="MenuEntryHeight" type="Int" >
+ <label>Height of menu entries in pixels</label>
+ <default>0</default>
++++++ startkde.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,5 +1,5 @@
---- startkde 2006/03/07 10:08:29 1.1
-+++ startkde 2006/03/07 10:11:24
+--- startkde
++++ startkde
@@ -19,7 +19,7 @@
# people's heads. We use colours from the standard KDE palette for those with
# palettised displays.
++++++ suse_default_move.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,5 +1,5 @@
---- empty/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ default_desktop/Makefile.am 2003-09-12 13:08:49.000000000 +0200
+--- empty/Makefile.am
++++ empty/Makefile.am
@@ -0,0 +1,17 @@
+# set the include path for X, qt and KDE
+INCLUDES= $(all_includes)
@@ -18,16 +18,16 @@
+default_desktop_aligning_LDADD = $(LIB_KDEUI)
+
+KDesktopIface_DIR = $(srcdir)/../kdesktop
-diff -urN /var/tmp/vi.recover/moving.cpp empty/moving.cpp
---- empty/moving.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ default_desktop/moving.cpp 2003-09-12 15:33:15.000000000 +0200
-@@ -0,0 +1,52 @@
+--- empty/moving.cpp
++++ empty/moving.cpp
+@@ -0,0 +1,56 @@
+#include
+#include
+#include
+#include "KDesktopIface_stub.h"
+#include
+#include
++#include
+#include
+#include
+#include
@@ -47,7 +47,10 @@
+ icons.sort();
+
+ KDesktopIface_stub stub("kdesktop", "KDesktopIface");
++ KConfig c( "kdesktoprc" );
++ c.setGroup( "General" );
+
++ if ( c.readBoolEntry( "CopyDesktopLinks", true ) )
+ for (QStringList::ConstIterator it = icons.begin(); it != icons.end(); ++it)
+ {
+ QString name = *it;
@@ -74,24 +77,3 @@
+ system(QString("rm -f %1/moving_desktop.desktop").arg(KGlobalSettings::autostartPath()).latin1());
+ system(QString("rm -rf '%1'").arg(tname).local8Bit());
+}
---- empty/moving.cpp 2004-02-24 15:00:52.000000000 +0000
-+++ empty/moving.cpp 2004-02-24 15:03:41.000000000 +0000
-@@ -4,6 +4,7 @@
- #include "KDesktopIface_stub.h"
- #include
- #include
-+#include
- #include
- #include
- #include
-@@ -23,7 +24,10 @@
- icons.sort();
-
- KDesktopIface_stub stub("kdesktop", "KDesktopIface");
-+ KConfig c( "kdesktoprc" );
-+ c.setGroup( "General" );
-
-+ if ( c.readBoolEntry( "CopyDesktopLinks", true ) )
- for (QStringList::ConstIterator it = icons.begin(); it != icons.end(); ++it)
- {
- QString name = *it;
++++++ taskbar-size.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,6 +1,6 @@
---- kicker/taskbar/taskbar.cpp.sav 2006-02-20 15:54:16.000000000 +0100
-+++ kicker/taskbar/taskbar.cpp 2006-03-22 14:58:28.000000000 +0100
-@@ -186,7 +186,7 @@ QSize TaskBar::sizeHint( KPanelExtension
+--- kicker/taskbar/taskbar.cpp
++++ kicker/taskbar/taskbar.cpp
+@@ -200,7 +200,7 @@
maxWidth = BUTTON_MAX_WIDTH;
}
++++++ teach-minicli-lock.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,7 +1,7 @@
Index: minicli.cpp
-===================================================================
---- kdesktop/minicli.cpp (revision 469625)
-+++ kdesktop/minicli.cpp (working copy)
+================================================================================
+--- kdesktop/minicli.cpp
++++ kdesktop/minicli.cpp
@@ -265,7 +265,9 @@
}
++++++ use-full-hinting-by-default.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,21 +1,8 @@
Index: kcontrol/krdb/krdb.cpp
-===================================================================
---- kcontrol/krdb/krdb.cpp (revision 524039)
-+++ kcontrol/krdb/krdb.cpp (working copy)
-@@ -507,7 +507,7 @@ void runRdb( uint flags )
- {
- kglobals.setGroup("General");
-
-- QString hintStyle(kglobals.readEntry("XftHintStyle", "hintmedium")),
-+ QString hintStyle(kglobals.readEntry("XftHintStyle", "hintfull")),
- subPixel(kglobals.readEntry("XftSubPixel"));
-
- contents += "Xft.antialias: ";
-Index: kcontrol/fonts/fonts.cpp
-===================================================================
---- kcontrol/fonts/fonts.cpp (revision 524039)
-+++ kcontrol/fonts/fonts.cpp (working copy)
-@@ -313,7 +313,7 @@ bool FontAASettings::load()
+================================================================================
+--- kcontrol/fonts/fonts.cpp
++++ kcontrol/fonts/fonts.cpp
+@@ -314,7 +314,7 @@
KConfig kglobals("kdeglobals", false, false);
kglobals.setGroup("General");
@@ -24,7 +11,7 @@
xft.setHintStyle(hStyle);
xft.apply(); // Save this setting
kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
-@@ -390,7 +390,7 @@ void FontAASettings::defaults()
+@@ -391,7 +391,7 @@
excludeTo->setValue(15.0);
useSubPixel->setChecked(false);
#ifdef HAVE_FONTCONFIG
@@ -33,7 +20,7 @@
#endif
enableWidgets();
}
-@@ -446,7 +446,7 @@ KXftConfig::Hint::Style FontAASettings::
+@@ -447,7 +447,7 @@
if(hintingStyle->currentText()==i18n(KXftConfig::description((KXftConfig::Hint::Style)s).utf8()))
return (KXftConfig::Hint::Style)s;
@@ -42,3 +29,14 @@
}
#endif
+--- kcontrol/krdb/krdb.cpp
++++ kcontrol/krdb/krdb.cpp
+@@ -507,7 +507,7 @@
+ {
+ kglobals.setGroup("General");
+
+- QString hintStyle(kglobals.readEntry("XftHintStyle", "hintmedium")),
++ QString hintStyle(kglobals.readEntry("XftHintStyle", "hintfull")),
+ subPixel(kglobals.readEntry("XftSubPixel"));
+
+ contents += "Xft.antialias: ";
++++++ workaround-pdf-on64bit-nsplugin-bug.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,11 +1,8 @@
Index: nsplugins/nspluginloader.cpp
-===================================================================
-RCS file: /home/kde/kdebase/nsplugins/nspluginloader.cpp,v
-retrieving revision 1.37
-diff -u -3 -p -u -r1.37 nspluginloader.cpp
---- nsplugins/nspluginloader.cpp 14 Jul 2003 19:33:02 -0000 1.37
-+++ nsplugins/nspluginloader.cpp 30 Sep 2004 13:15:01 -0000
-@@ -220,7 +220,7 @@ QString NSPluginLoader::lookup(const QSt
+================================================================================
+--- nsplugins/nspluginloader.cpp
++++ nsplugins/nspluginloader.cpp
+@@ -257,7 +257,7 @@
}
@@ -14,7 +11,7 @@
{
kdDebug() << "NSPluginLoader::loadViewer" << endl;
-@@ -244,7 +244,7 @@ bool NSPluginLoader::loadViewer()
+@@ -281,7 +281,7 @@
}
// find the external artsdsp process
@@ -23,7 +20,7 @@
kdDebug() << "trying to use artsdsp" << endl;
QString artsdsp = KGlobal::dirs()->findExe("artsdsp");
if (!artsdsp)
-@@ -358,7 +358,7 @@ NSPluginInstance *NSPluginLoader::newIns
+@@ -395,7 +395,7 @@
if ( !_viewer )
{
// load plugin viewer process
@@ -32,14 +29,9 @@
if ( !_viewer )
{
-Index: nsplugins/nspluginloader.h
-===================================================================
-RCS file: /home/kde/kdebase/nsplugins/nspluginloader.h,v
-retrieving revision 1.17
-diff -u -3 -p -u -r1.17 nspluginloader.h
---- nsplugins/nspluginloader.h 7 Mar 2003 22:05:29 -0000 1.17
-+++ nsplugins/nspluginloader.h 30 Sep 2004 13:15:01 -0000
-@@ -77,7 +77,7 @@ protected:
+--- nsplugins/nspluginloader.h
++++ nsplugins/nspluginloader.h
+@@ -87,7 +87,7 @@
QString lookup(const QString &mimeType);
QString lookupMimeType(const QString &url);
++++++ xcursor.diff ++++++
--- /var/tmp/diff_new_pack.GsPXUl/_old 2006-04-25 21:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.GsPXUl/_new 2006-04-25 21:54:12.000000000 +0200
@@ -1,6 +1,6 @@
---- kcontrol/input/xcursor/themepage.cpp.sav 2004-01-23 17:27:31.000000000 +0100
-+++ kcontrol/input/xcursor/themepage.cpp 2004-03-08 23:27:52.000000000 +0100
-@@ -75,6 +75,13 @@ struct ThemeInfo {
+--- kcontrol/input/xcursor/themepage.cpp
++++ kcontrol/input/xcursor/themepage.cpp
+@@ -73,6 +73,13 @@
};
@@ -14,7 +14,7 @@
ThemePage::ThemePage( QWidget* parent, const char* name )
: QWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL )
{
-@@ -327,7 +334,7 @@ void ThemePage::insertTheme( const QStri
+@@ -327,7 +334,7 @@
// Defaults in case there's no name or comment field.
QString name = dirName;
@@ -23,7 +23,7 @@
QString sample = "left_ptr";
KSimpleConfig c( path + "/index.theme", true ); // Open read-only
-@@ -474,7 +481,7 @@ void ThemePage::insertThemes()
+@@ -474,7 +481,7 @@
// Defaults in case there's no index.theme file or it lacks
// a name and a comment field.
QString name = *it;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...