Hello community,
here is the log from the commit of package kdebase3
checked in at Thu Sep 14 01:36:24 CEST 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-09-12 15:21:15.000000000 +0200
+++ kdebase3/kdebase3.changes 2006-09-12 20:59:52.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 12 20:59:30 CEST 2006 - dmueller@suse.de
+
+- update 3_5_BRANCH to fix kicker hang (#204728)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:01.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:01.000000000 +0200
@@ -41,7 +41,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.4
-Release: 17
+Release: 18
%define kde_version 3.5.4
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -101,7 +101,7 @@
Patch72: kdm-all-users-nopass.diff
Patch73: kdm-session-names.diff
Patch74: kdm-sysconfig-values.diff
-# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@476009 $BASE/branches/work/coolos_kdm
+# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@583746 $BASE/branches/work/coolos_kdm
Patch75: kdm-make_it_cool.diff
Patch76: kdm-admin-mode.diff
Patch77: kdm-fix-default-kdmrc.diff
@@ -342,7 +342,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 118
+Release: 119
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1420,6 +1420,8 @@
%endif
%changelog -n kdebase3
+* Tue Sep 12 2006 - dmueller@suse.de
+- update 3_5_BRANCH to fix kicker hang (#204728)
* Tue Sep 12 2006 - stbinner@suse.de
- update kickoff patch and package plugin to kdebase3-beagle
- add "bnc" web shortcut for Novell Bugzilla (#204724)
++++++ 3_5_BRANCH.diff ++++++
++++ 55544 lines (skipped)
++++ between KDE/kdebase3/3_5_BRANCH.diff
++++ and kdebase3/3_5_BRANCH.diff
++++++ autorun.patch ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:02.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:02.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- kioslave/media/medianotifier/medianotifier.cpp
+++ kioslave/media/medianotifier/medianotifier.cpp
-@@ -125,7 +125,7 @@
+@@ -133,7 +133,7 @@
// be checked for the following Autostart files in order of precedence:
// .autorun, autorun, autorun.sh
QStringList autorun_list;
@@ -11,7 +11,7 @@
QStringList::iterator it = autorun_list.begin();
QStringList::iterator end = autorun_list.end();
-@@ -183,7 +183,12 @@
+@@ -191,7 +191,12 @@
// with the current working directory ( CWD ) set to the root
// directory of the medium.
KProcess proc;
++++++ clock-use-yast.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:02.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:02.000000000 +0200
@@ -1,8 +1,6 @@
-Index: kicker/applets/clock/clock.cpp
-================================================================================
--- kicker/applets/clock/clock.cpp
+++ kicker/applets/clock/clock.cpp
-@@ -1416,24 +1416,25 @@
+@@ -1459,24 +1459,25 @@
return;
};
@@ -38,7 +36,7 @@
break;
case 110:
preferences(true);
-@@ -1441,6 +1442,12 @@
+@@ -1484,6 +1485,12 @@
} /* switch() */
}
@@ -61,10 +59,10 @@
namespace KIO
{
-@@ -297,6 +298,7 @@
- void aboutToShowContextMenu();
+@@ -298,6 +299,7 @@
void fixupLayout();
void globalPaletteChange();
+ void setTimerTo60();
+ void kdesu_exited( KProcess *pr );
protected:
++++++ default_fonts.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:02.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:02.000000000 +0200
@@ -5,7 +5,7 @@
// KDE Display fonts setup tab
//
// Copyright (c) Mark Donohoe 1997
-@@ -508,11 +509,11 @@
+@@ -500,11 +501,11 @@
// Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
++++++ disable-kcmaccess.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:02.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:02.000000000 +0200
@@ -11,7 +11,7 @@
else
--- kcontrol/access/kcmaccess.cpp
+++ kcontrol/access/kcmaccess.cpp
-@@ -680,7 +680,7 @@
+@@ -686,7 +686,7 @@
bounceKeysDelay->setValue(config->readNumEntry("BounceKeysDelay", 500));
bounceKeysRejectBeep->setChecked(config->readBoolEntry("BounceKeysRejectBeep", true));
++++++ fix_default_theme_reset.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:02.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:02.000000000 +0200
@@ -35,8 +35,8 @@
+ tmpCol.setAttribute( "value", cfg->readNumEntry( *it, defsize ) );
+ else if ( (*it).contains( "Value" ))
tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) );
- else if ( (*it).contains( "Effect" ) )
- tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) );
+ else if ( (*it).contains( "DisabledEffect" ) )
+ tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" ) );
--- kcontrol/kthememanager/ktheme.h
+++ kcontrol/kthememanager/ktheme.h
@@ -155,11 +155,12 @@
++++++ hide-only-showin-entries.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:02.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:02.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- konqueror/konq_mainwindow.cc
+++ konqueror/konq_mainwindow.cc
-@@ -4866,6 +4866,9 @@
+@@ -4923,6 +4923,9 @@
KTrader::OfferList::ConstIterator end = services.end();
for (; it != end; ++it )
{
++++++ improve-panelservicemenu-geticonset.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:02.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:02.000000000 +0200
@@ -1,6 +1,6 @@
--- kicker/libkicker/global.cpp
+++ kicker/libkicker/global.cpp
-@@ -386,6 +386,12 @@
+@@ -424,6 +424,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 @@
+@@ -436,8 +442,14 @@
active.convertFromImage(active.convertToImage().smoothScale(20,20));
}
++++++ kappfinder-auto.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:02.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:02.000000000 +0200
@@ -15,7 +15,7 @@
kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--- kappfinder/apps/Multimedia/mplayer.desktop
+++ kappfinder/apps/Multimedia/mplayer.desktop
-@@ -75,7 +75,7 @@
+@@ -76,7 +76,7 @@
GenericName[zh_CN]=视频播放器
GenericName[zh_TW]=視像檔播放程式
GenericName[zu]=Umdlali we-Vidiyo
++++++ kdebase_http_offline_mode.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -11,7 +11,7 @@
#include
#include
#include
-@@ -729,7 +731,7 @@
+@@ -731,7 +733,7 @@
QString serviceName; // default: none provided
@@ -20,7 +20,7 @@
{
serviceType = "KonqAboutPage"; // not KParts/ReadOnlyPart, it fills the Location menu ! :)
serviceName = "konq_aboutpage";
-@@ -3709,6 +3711,9 @@
+@@ -3716,6 +3718,9 @@
}
(void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), this, SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
@@ -30,7 +30,7 @@
m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), this, SLOT( slotToolFind() ), actionCollection(), "findfile" );
m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
-@@ -5309,6 +5314,36 @@
+@@ -5366,6 +5371,36 @@
}
}
@@ -69,7 +69,7 @@
static const QString& http = KGlobal::staticQString( "http" );
--- konqueror/konq_mainwindow.h
+++ konqueror/konq_mainwindow.h
-@@ -363,6 +363,7 @@
+@@ -364,6 +364,7 @@
void slotOpenTerminal();
void slotOpenLocation();
void slotToolFind();
@@ -77,7 +77,7 @@
// View menu
void slotViewModeToggle( bool toggle );
-@@ -599,6 +600,7 @@
+@@ -601,6 +602,7 @@
bool stayPreloaded();
bool checkPreloadResourceUsage();
@@ -85,7 +85,7 @@
QObject* lastFrame( KonqView *view );
-@@ -666,7 +668,8 @@
+@@ -668,7 +670,8 @@
KToggleAction *m_paShowMenuBar;
KToggleAction *m_paShowStatusBar;
++++++ kdeeject.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -47,7 +47,7 @@
# Checking for stuff in the PATH is ugly with sh.
# I guess this is the reason for making this a kde app...
OS=`uname -s`
-@@ -31,7 +57,5 @@
+@@ -34,7 +60,5 @@
elif test $quiet -eq 0; then
kdialog --title "KDE Eject" --error "Eject $1 failed!"
fi
++++++ kdesktop_icons.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -55,7 +55,7 @@
// Create the equivalent of KAccelBase::connectItem
// and then remove this include and fix reconnects in initRoot() -- ellis
//#include
-@@ -972,4 +975,47 @@
+@@ -981,4 +984,47 @@
return QWidget::event(e);
}
@@ -119,7 +119,7 @@
--- kdesktop/kdiconview.cc
+++ kdesktop/kdiconview.cc
-@@ -946,6 +946,18 @@
+@@ -954,6 +954,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();
-@@ -1010,15 +1022,6 @@
+@@ -1018,15 +1030,6 @@
kdDebug(1214)<<"Using saved position"<sync();
}
++++++ kdesu-dont-keep-pwd.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- kdesu/kdesu/kdesu.cpp
+++ kdesu/kdesu/kdesu.cpp
-@@ -269,7 +269,7 @@
+@@ -270,7 +270,7 @@
}
// Try to exec the command with kdesud.
@@ -10,4 +10,4 @@
+ bool keep = false; //!args->isSet("n") && have_daemon;
bool terminal = args->isSet("t");
bool new_dcop = args->isSet("newdcop");
-
+ bool withIgnoreButton = args->isSet("ignorebutton");
++++++ kdm-admin-mode.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -290,7 +290,7 @@
#include "themer/kdmthemer.h"
#include "themer/kdmitem.h"
#include "themer/kdmlabel.h"
-@@ -469,7 +470,7 @@
+@@ -475,7 +476,7 @@
for (char **dit = _sessionsDirs; *dit; ++dit) {
QStringList ents = QDir( *dit ).entryList();
for (QStringList::ConstIterator it = ents.begin(); it != ents.end(); ++it)
@@ -299,7 +299,7 @@
KSimpleConfig dsk( QString( *dit ).append( '/' ).append( *it ) );
dsk.setGroup( "Desktop Entry" );
putSession( (*it).left( (*it).length() - 8 ),
-@@ -608,6 +609,17 @@
+@@ -614,6 +615,17 @@
return;
}
} else {
@@ -317,7 +317,7 @@
for (uint i = 0; i < sessionTypes.count() && !sessionTypes[i].hid; i++)
if (sessionTypes[i].type == sess) {
free( sess );
-@@ -954,6 +966,12 @@
+@@ -962,6 +974,12 @@
}
}
@@ -327,10 +327,10 @@
+ admin_button->hide( true );
+ }
+
- QPopupMenu *plugMenu = verify->getPlugMenu();
if (plugMenu) {
inserten( i18n("&Authentication Method"), 0, plugMenu );
-@@ -1055,6 +1073,8 @@
+ needSep = true;
+@@ -1062,6 +1080,8 @@
slotSessMenu();
else if (id == "system_button")
slotActionMenu();
@@ -339,7 +339,7 @@
}
void
-@@ -1081,4 +1101,15 @@
+@@ -1088,4 +1108,15 @@
accept();
}
@@ -396,7 +396,7 @@
+Comment=Yast Admin Session
--- kdm/kfrontend/themer/kdmlabel.cpp
+++ kdm/kfrontend/themer/kdmlabel.cpp
-@@ -213,6 +213,7 @@
+@@ -214,6 +214,7 @@
{ "language", I18N_NOOP("&Language") },
{ "session", I18N_NOOP("Session &Type") },
{ "system", I18N_NOOP("&System") }, // i18n("Actions");
++++++ kdm-all-users-nopass.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- kdm/backend/client.c
+++ kdm/backend/client.c
-@@ -387,6 +387,9 @@
+@@ -372,6 +372,9 @@
if (cursource != PWSRC_MANUAL)
return 1;
++++++ kdm-fix-default-kdmrc.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -1,7 +1,7 @@
Index: kdm/config.def
-===================================================================
---- kdm/config.def (Revision 576916)
-+++ kdm/config.def (Arbeitskopie)
+================================================================================
+--- kdm/config.def
++++ kdm/config.def
@@ -874,10 +874,10 @@
Key: PidFile
@@ -201,7 +201,7 @@
Comment: &
Description:
Who is allowed to shut down the system. This applies both to the
-@@ -1857,6 +1854,7 @@
+@@ -1866,6 +1863,7 @@
Default: false
User: dep
Instance: #:0/true
@@ -209,7 +209,7 @@
Comment: &
Description:
Enable automatic login. <emphasis>Use with extreme care!</emphasis>
-@@ -1890,7 +1888,7 @@
+@@ -1899,7 +1897,7 @@
PostProc: PautoLoginX
User: core(autoUser)
User: greeter
@@ -218,7 +218,7 @@
Merge: xdm:autoUser(P_autoUser)
Comment: &
Description:
-@@ -1921,10 +1919,10 @@
+@@ -1930,10 +1928,10 @@
Key: SessionsDirs
Type: list
@@ -231,7 +231,7 @@
Comment:
The directories containing session type definitions in .desktop format.
Description:
-@@ -1999,7 +1997,8 @@
+@@ -2019,7 +2017,8 @@
Clock/LOGO_CLOCK: a neat analog clock
Default: Clock
User: greeter
@@ -241,7 +241,7 @@
Comment:
What should be shown in the greeter's logo are:
Description:
-@@ -2214,7 +2213,7 @@
+@@ -2234,7 +2233,7 @@
Key: HiddenUsers
Type: list
@@ -250,7 +250,7 @@
User: greeter-c(noUsers)
Instance: #*/"root"
# depends on {Min,Max}ShowUID
-@@ -2354,13 +2353,14 @@
+@@ -2374,13 +2373,14 @@
Default: OneStar
User: greeter
Instance: #*/NoEcho
@@ -266,7 +266,7 @@
User: greeter
Instance: #*/!
Comment:
-@@ -2498,6 +2498,7 @@
+@@ -2518,6 +2518,7 @@
Default: false
User: greeter
Instance: :0/true
@@ -274,7 +274,7 @@
Comment:
Enable &kdm;'s built-in xconsole. Note that this can be enabled for only
one display at a time.
-@@ -2586,9 +2587,10 @@
+@@ -2606,9 +2607,10 @@
Key: Preloader
Type: string
@@ -287,7 +287,7 @@
Comment: &
Description:
A program to run while the greeter is visible. It is supposed to preload
-@@ -2597,7 +2599,7 @@
+@@ -2617,7 +2619,7 @@
Key: UseTheme
Type: bool
@@ -296,7 +296,7 @@
User: greeter
Instance: #*/true
Comment: &
-@@ -2606,9 +2608,10 @@
+@@ -2626,9 +2628,10 @@
Key: Theme
Type: string
@@ -309,10 +309,8 @@
Comment: &
Description:
The theme to use for the greeter. Can point to either a directory or an XML
-Index: kdm/kfrontend/genkdmconf.c
-===================================================================
---- kdm/kfrontend/genkdmconf.c (Revision 576916)
-+++ kdm/kfrontend/genkdmconf.c (Arbeitskopie)
+--- kdm/kfrontend/genkdmconf.c
++++ kdm/kfrontend/genkdmconf.c
@@ -1363,6 +1363,13 @@
}
#endif
++++++ kdm-make_it_cool.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -1,5 +1,17 @@
-Index: kfrontend/themer/kdmrect.h
+Index: kfrontend/kdm_greet.c
================================================================================
+--- kfrontend/kdm_greet.c
++++ kfrontend/kdm_greet.c
+@@ -44,8 +44,8 @@
+ # include
+ #endif
+
+-#if defined(HAVE_XTEST) || defined(HAVE_XKB)
+ # include
++#if defined(HAVE_XTEST) || defined(HAVE_XKB)
+ # include
+ #endif
+
--- kfrontend/kdmconfig.cpp
+++ kfrontend/kdmconfig.cpp
@@ -33,6 +33,8 @@
@@ -52,7 +64,7 @@
#include
#include
-@@ -129,6 +131,7 @@
+@@ -130,6 +132,7 @@
static char *argv[] = { (char *)"kdmgreet", 0 };
KCmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true );
@@ -60,7 +72,7 @@
kde_have_kipc = false;
KApplication::disableAutoDcopRegistration();
KCrash::setSafer( true );
-@@ -165,6 +168,7 @@
+@@ -166,6 +169,7 @@
GSendInt( G_Ready );
@@ -68,7 +80,7 @@
setCursor( dpy, app.desktop()->winId(), XC_left_ptr );
for (;;) {
-@@ -205,6 +209,7 @@
+@@ -206,6 +210,7 @@
if (_useTheme && !_theme.isEmpty()) {
KThemedGreeter *tgrt;
dialog = tgrt = new KThemedGreeter;
@@ -325,7 +337,7 @@
{
struct passwd *ps;
-@@ -266,6 +350,8 @@
+@@ -271,6 +355,8 @@
if (_showUsers == SHOW_ALL) {
UserList noUsers( _noUsers );
QDict<int> dupes( 1000 );
@@ -334,7 +346,7 @@
for (setpwent(); (ps = getpwent()) != 0;) {
if (*ps->pw_dir && *ps->pw_shell &&
(ps->pw_uid >= (unsigned)_lowUserId ||
-@@ -277,10 +363,53 @@
+@@ -282,10 +368,53 @@
QString username( QFile::decodeName( ps->pw_name ) );
if (!dupes.find( username )) {
dupes.insert( username, (int *)-1 );
@@ -389,7 +401,7 @@
} else {
UserList users( _users );
if (users.hasGroups()) {
-@@ -680,22 +809,25 @@
+@@ -687,21 +816,24 @@
hbox2->addStretch( 1 );
if (sessMenu->count() > 1) {
@@ -398,7 +410,6 @@
needSep = true;
}
- QPopupMenu *plugMenu = verify->getPlugMenu();
if (plugMenu) {
- inserten( i18n("&Authentication Method"), ALT+Key_A, plugMenu );
+ inserten( i18n("&Authentication Method"), 0, plugMenu );
@@ -418,7 +429,7 @@
if (optMenu)
menuButton->setPopup( optMenu );
else
-@@ -786,6 +918,9 @@
+@@ -793,6 +925,9 @@
if (xauth_warning && (_authorized || !_authComplain))
xauth_warning->hide( true );
@@ -428,7 +439,7 @@
// if (!_greetString.isEmpty()) {
// }
// clock = new KdmClock( this, "clock" );
-@@ -810,38 +945,32 @@
+@@ -818,37 +953,31 @@
if ((itm = themer->findNode( "session_button" ))) {
if (sessMenu->count() <= 1)
itm->hide( true );
@@ -448,7 +459,6 @@
}
}
- QPopupMenu *plugMenu = verify->getPlugMenu();
if (plugMenu) {
- inserten( i18n("&Authentication Method"), ALT+Key_A, plugMenu );
+ inserten( i18n("&Authentication Method"), 0, plugMenu );
@@ -473,7 +483,7 @@
verify->start();
}
-@@ -859,8 +988,8 @@
+@@ -866,8 +995,8 @@
inherited::pluginSetup();
if (userView && verify->entitiesLocal() && verify->entityPresettable() && userlist_rect) {
@@ -526,7 +536,7 @@
#include
#include
-@@ -34,9 +35,7 @@
+@@ -35,9 +36,7 @@
#include
#include
#include
@@ -537,7 +547,7 @@
KdmItem::KdmItem( KdmItem *parent, const QDomNode &node, const char *name )
: QObject( parent, name )
-@@ -47,6 +46,25 @@
+@@ -48,6 +47,25 @@
, myLayoutItem( 0 )
, buttonParent( 0 )
{
@@ -563,7 +573,7 @@
// Set default layout for every item
currentManager = MNone;
pos.x = pos.y = 0;
-@@ -61,7 +79,7 @@
+@@ -62,7 +80,7 @@
state = Snormal;
// The "toplevel" node (the screen) is really just like a fixed node
@@ -572,7 +582,7 @@
setFixedLayout();
return;
}
-@@ -86,7 +104,7 @@
+@@ -87,7 +105,7 @@
id = tnode.toElement().attribute( "id", QString::number( (ulong)this, 16 ) );
// Tell 'parent' to add 'me' to its children
@@ -581,16 +591,16 @@
parentItem->addChildItem( this );
}
-@@ -189,7 +207,7 @@
- else
- myWidget->show();
+@@ -195,7 +213,7 @@
+ if (frame)
+ frame->setFrameStyle( QFrame::NoFrame );
- myWidget->setGeometry(area);
+ setGeometry(area, true);
connect( myWidget, SIGNAL(destroyed()), SLOT(widgetGone()) );
}
-@@ -230,15 +248,21 @@
+@@ -236,15 +254,21 @@
area = newGeometry;
@@ -615,7 +625,7 @@
// recurr to all fixed children
if (fixedManager && !fixedManager->isEmpty())
fixedManager->update( newGeometry, force );
-@@ -252,8 +276,16 @@
+@@ -258,8 +282,16 @@
if (isHidden())
return;
@@ -634,7 +644,7 @@
if (area.intersects( rect )) {
QRect contentsRect = area.intersect( rect );
-@@ -274,6 +306,8 @@
+@@ -280,6 +312,8 @@
QValueList::Iterator it;
for (it = m_children.begin(); it != m_children.end(); ++it)
(*it)->paint( p, rect );
@@ -643,16 +653,20 @@
}
KdmItem *KdmItem::currentActive = 0;
-@@ -282,7 +316,7 @@
+@@ -287,8 +321,11 @@
+ void
KdmItem::mouseEvent( int x, int y, bool pressed, bool released )
{
++ if (isShown == ExplicitlyHidden)
++ return;
++
if (buttonParent && buttonParent != this) {
- buttonParent->mouseEvent( x, y, pressed, released );
+ buttonParent->mouseEvent( x, y, pressed, released );
return;
}
-@@ -356,7 +390,8 @@
+@@ -362,7 +399,8 @@
w = parentRect.width(),
h = parentRect.height();
@@ -662,7 +676,7 @@
// check if width or height are set to "box"
if (pos.wType == DTbox || pos.hType == DTbox) {
if (myLayoutItem || myWidget)
-@@ -366,7 +401,7 @@
+@@ -372,7 +410,7 @@
return parentRect;
boxHint = boxManager->sizeHint();
}
@@ -671,7 +685,7 @@
}
if (pos.xType == DTpixel)
-@@ -374,25 +409,25 @@
+@@ -380,25 +418,25 @@
else if (pos.xType == DTnpixel)
x = parentRect.right() - pos.x;
else if (pos.xType == DTpercent)
@@ -701,7 +715,7 @@
else
w = 0;
-@@ -401,14 +436,22 @@
+@@ -407,14 +445,22 @@
else if (pos.hType == DTnpixel)
h -= pos.height;
else if (pos.hType == DTpercent)
@@ -728,7 +742,7 @@
// defaults to center
int dx = -w / 2, dy = -h / 2;
-@@ -424,7 +467,7 @@
+@@ -430,7 +476,7 @@
dx = -w;
}
// KdmItem *p = static_cast( parent() );
@@ -737,7 +751,7 @@
y += dy;
x += dx;
-@@ -523,4 +566,17 @@
+@@ -529,4 +575,17 @@
currentManager = MFixed;
}
@@ -794,9 +808,11 @@
QValueList m_children;
--- kfrontend/themer/kdmlabel.cpp
+++ kfrontend/themer/kdmlabel.cpp
-@@ -20,7 +20,8 @@
+@@ -19,8 +19,10 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
++#include
#include "kdmlabel.h"
-#include
+#include "kdmconfig.h"
@@ -804,7 +820,7 @@
#include
#include
-@@ -31,6 +32,7 @@
+@@ -31,6 +33,7 @@
#include
#include
#include
@@ -812,7 +828,7 @@
#include
#include
-@@ -39,7 +41,7 @@
+@@ -39,7 +42,7 @@
#endif
KdmLabel::KdmLabel( KdmItem *parent, const QDomNode &node, const char *name )
@@ -821,7 +837,7 @@
{
itemType = "label";
-@@ -92,21 +94,46 @@
+@@ -92,21 +95,46 @@
}
}
@@ -871,7 +887,7 @@
}
QSize
-@@ -139,7 +166,23 @@
+@@ -139,7 +167,23 @@
p->setFont( l->font );
p->setPen( l->color );
//TODO paint clipped (tested but not working..)
@@ -896,7 +912,7 @@
}
void
-@@ -159,7 +202,7 @@
+@@ -159,7 +203,7 @@
{
QString text = lookupText( label.text );
if (text != cText) {
@@ -905,7 +921,7 @@
needUpdate();
}
}
-@@ -167,22 +210,23 @@
+@@ -167,22 +211,23 @@
static const struct {
const char *type, *text;
} stocks[] = {
@@ -943,7 +959,7 @@
};
QString
-@@ -195,7 +239,7 @@
+@@ -195,7 +240,7 @@
if (type == stocks[i].type)
return i18n(stocks[i].text);
@@ -952,7 +968,7 @@
return stock;
}
-@@ -205,7 +249,6 @@
+@@ -205,7 +250,6 @@
QString text = t;
text.replace( '_', '&' );
++++++ kdm-mark_autologin.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:04.000000000 +0200
@@ -1,6 +1,6 @@
--- kdm/backend/client.c
+++ kdm/backend/client.c
-@@ -1142,6 +1142,8 @@
+@@ -1135,6 +1135,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-relaxed-auth.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -10,7 +10,7 @@
#endif
#if !defined(NEED_UTSNAME) || defined(__hpux)
-@@ -1212,6 +1213,9 @@
+@@ -1211,6 +1212,9 @@
userEnviron = setEnv( userEnviron, "XAUTHORITY", envname );
systemEnviron = setEnv( systemEnviron, "XAUTHORITY", envname );
}
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,141 +1,17 @@
Index: kdm/kfrontend/read_sysconfig.sh
-===================================================================
---- kdm/kfrontend/read_sysconfig.sh (Revision 0)
-+++ kdm/kfrontend/read_sysconfig.sh (Revision 0)
-@@ -0,0 +1,123 @@
-+#!/bin/bash
-+#
-+# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany.
-+#
-+# Author: Stephan Kulow
-+#
-+
-+#
-+# check if we are started as root
-+# only one of UID and USER must be set correctly
-+#
-+if test "$UID" != 0 -a "$USER" != root; then
-+ echo "You must be root to start $0."
-+ exit 1
-+fi
-+
-+#
-+# check for sysconfig/displaymanager or rc.config
-+#
-+test -f /etc/sysconfig/displaymanager && source /etc/sysconfig/displaymanager
-+test -f /etc/sysconfig/security && source /etc/sysconfig/security
-+test -f /etc/sysconfig/language && source /etc/sysconfig/language
-+
-+#
-+# source /etc/profile to get $kdedir
-+#
-+kdedir="/opt/kde3"
-+kdmdir="/var/adm/kdm"
-+
-+# check for write permissions
-+[ -w ${kdmdir} ] || mkdir -p ${kdmdir}
-+[ -w ${kdmdir} ] || exit
-+
-+#
-+# Set Style of Shutdown
-+#
-+ECHO_MODE="OneStar"
-+ALLOW_ROOT_LOGIN="true"
-+case "$DISPLAYMANAGER_SHUTDOWN" in
-+ all|ALL|All)
-+ DISPLAYMANAGER_SHUTDOWN=All;;
-+ none|NONE|None)
-+ DISPLAYMANAGER_SHUTDOWN=None;;
-+ auto|Auto|AUTO)
-+ case "$PERMISSION_SECURITY" in
-+ *easy*)
-+ DISPLAYMANAGER_SHUTDOWN=All
-+ ;;
-+ *paranoid*)
-+ ECHO_MODE="NoEcho"
-+ ALLOW_ROOT_LOGIN="false"
-+ DISPLAYMANAGER_SHUTDOWN=Root
-+ ;;
-+ *)
-+ DISPLAYMANAGER_SHUTDOWN=All
-+ ;;
-+ esac
-+ ;;
-+ * )
-+ DISPLAYMANAGER_SHUTDOWN=Root;;
-+esac
-+
-+(
-+echo "[X-*-Greeter]"
-+if [ -n "$KDM_USERS" ]; then
-+ echo "ShowUsers=Selected"
-+ echo -n "SelectedUsers="
-+ echo ${KDM_USERS}|sed -e 's@ [ ]*@ @g' -e 's@ @,@g'
-+else
-+ echo "ShowUsers=NotHidden"
-+fi
-+if [ "$DISPLAYMANAGER_AD_INTEGRATION" = "yes" ]; then
-+ echo "PluginsLogin=winbind"
-+fi
-+if [ -n "$DISPLAYMANAGER_KDM_THEME" -a -d "/opt/kde3/share/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME" ]; then
-+ echo "Theme=/opt/kde3/share/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME"
-+ echo "UseTheme=true"
-+ echo "UseBackground=false"
-+else
-+ echo "UseTheme=false"
-+ echo "UseBackground=true"
-+fi
-+
-+echo "[Xdmcp]"
-+if [ "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ]; then
-+ echo "Enable=true"
-+else
-+ echo "Enable=false"
-+fi
-+
-+echo "[X-:0-Core]"
-+if [ "$DISPLAYMANAGER_AUTOLOGIN" ]; then
-+ echo "AutoLoginEnable=true"
-+ echo "AutoLoginUser=${DISPLAYMANAGER_AUTOLOGIN}"
-+else
-+ echo "AutoLoginEnable=false"
-+fi
-+if [ "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ]; then
-+ echo "ServerArgsLocal="
-+else
-+ echo "ServerArgsLocal=-nolisten tcp"
-+fi
-+if [ "$DISPLAYMANAGER_PASSWORD_LESS_LOGIN" = "yes" ]; then
-+ echo "NoPassEnable=true"
-+ echo "NoPassAllUsers=true"
-+else
-+ echo "NoPassEnable=false"
-+ echo "NoPassAllUsers=false"
-+fi
-+echo "AllowShutdown=${DISPLAYMANAGER_SHUTDOWN}"
-+echo "AllowRootLogin=${ALLOW_ROOT_LOGIN}"
-+echo "AllowNullPasswd=${ALLOW_ROOT_LOGIN}"
-+
-+echo "[X-*-Core]"
-+echo "EchoMode=${ECHO_MODE}"
-+
-+echo "[General]"
-+if [ "$DISPLAYMANAGER_STARTS_XSERVER" != "yes" ]; then
-+ echo "StaticServers="
-+fi
+================================================================================
+--- kdm/kfrontend/Makefile.am
++++ kdm/kfrontend/Makefile.am
+@@ -64,3 +64,7 @@
+ kdm_config_COMPILE_FIRST = ../config.ci
+ genkdmconf_COMPILE_FIRST = ../config.ci
+
+
-+) > ${kdmdir}/kdmrc.sysconfig
++appsdir = $(kde_datadir)/kdm
++apps_SCRIPTS = read_sysconfig.sh
+
-
-Eigenschaftsänderungen: kdm/kfrontend/read_sysconfig.sh
-___________________________________________________________________
-Name: svn:executable
- + *
-
-Index: kdm/kfrontend/kdm_config.c
-===================================================================
---- kdm/kfrontend/kdm_config.c (Revision 567799)
-+++ kdm/kfrontend/kdm_config.c (Arbeitskopie)
+--- kdm/kfrontend/kdm_config.c
++++ kdm/kfrontend/kdm_config.c
@@ -386,7 +386,7 @@
static Section *rootsec;
@@ -145,25 +21,23 @@
{
const char *nstr, *dstr, *cstr, *dhost, *dnum, *dclass;
char *s, *e, *st, *en, *ek, *sl, *pt;
-@@ -396,16 +396,11 @@
+@@ -396,14 +396,9 @@
int nlen, dlen, clen, dhostl, dnuml, dclassl;
int i, line, sectmoan, restl;
File file;
- static int confread;
- if (confread)
+- return;
+- confread = 1;
+-
+- Debug( "reading config %s ...\n", kdmrc );
+- if (!readFile( &file, kdmrc, "master configuration" ))
+ Debug( "reading config %s ...\n", rcfile );
+ if (!readFile( &file, rcfile, "master configuration" ))
return;
-- confread = 1;
-- Debug( "reading config %s ...\n", kdmrc );
-- if (!readFile( &file, kdmrc, "master configuration" ))
-- return;
--
for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) {
- line++;
-
@@ -429,7 +424,7 @@
e--;
if (*e != ']') {
@@ -273,15 +147,129 @@
static Entry *
FindGEnt( int id )
{
-Index: kdm/kfrontend/Makefile.am
-===================================================================
---- kdm/kfrontend/Makefile.am (Revision 567799)
-+++ kdm/kfrontend/Makefile.am (Arbeitskopie)
-@@ -64,3 +64,7 @@
- kdm_config_COMPILE_FIRST = ../config.ci
- genkdmconf_COMPILE_FIRST = ../config.ci
-
+--- kdm/kfrontend/read_sysconfig.sh
++++ kdm/kfrontend/read_sysconfig.sh
+@@ -0,0 +1,123 @@
++#!/bin/bash
++#
++# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany.
++#
++# Author: Stephan Kulow
++#
+
-+appsdir = $(kde_datadir)/kdm
-+apps_SCRIPTS = read_sysconfig.sh
++#
++# check if we are started as root
++# only one of UID and USER must be set correctly
++#
++if test "$UID" != 0 -a "$USER" != root; then
++ echo "You must be root to start $0."
++ exit 1
++fi
++
++#
++# check for sysconfig/displaymanager or rc.config
++#
++test -f /etc/sysconfig/displaymanager && source /etc/sysconfig/displaymanager
++test -f /etc/sysconfig/security && source /etc/sysconfig/security
++test -f /etc/sysconfig/language && source /etc/sysconfig/language
++
++#
++# source /etc/profile to get $kdedir
++#
++kdedir="/opt/kde3"
++kdmdir="/var/adm/kdm"
++
++# check for write permissions
++[ -w ${kdmdir} ] || mkdir -p ${kdmdir}
++[ -w ${kdmdir} ] || exit
++
++#
++# Set Style of Shutdown
++#
++ECHO_MODE="OneStar"
++ALLOW_ROOT_LOGIN="true"
++case "$DISPLAYMANAGER_SHUTDOWN" in
++ all|ALL|All)
++ DISPLAYMANAGER_SHUTDOWN=All;;
++ none|NONE|None)
++ DISPLAYMANAGER_SHUTDOWN=None;;
++ auto|Auto|AUTO)
++ case "$PERMISSION_SECURITY" in
++ *easy*)
++ DISPLAYMANAGER_SHUTDOWN=All
++ ;;
++ *paranoid*)
++ ECHO_MODE="NoEcho"
++ ALLOW_ROOT_LOGIN="false"
++ DISPLAYMANAGER_SHUTDOWN=Root
++ ;;
++ *)
++ DISPLAYMANAGER_SHUTDOWN=All
++ ;;
++ esac
++ ;;
++ * )
++ DISPLAYMANAGER_SHUTDOWN=Root;;
++esac
++
++(
++echo "[X-*-Greeter]"
++if [ -n "$KDM_USERS" ]; then
++ echo "ShowUsers=Selected"
++ echo -n "SelectedUsers="
++ echo ${KDM_USERS}|sed -e 's@ [ ]*@ @g' -e 's@ @,@g'
++else
++ echo "ShowUsers=NotHidden"
++fi
++if [ "$DISPLAYMANAGER_AD_INTEGRATION" = "yes" ]; then
++ echo "PluginsLogin=winbind"
++fi
++if [ -n "$DISPLAYMANAGER_KDM_THEME" -a -d "/opt/kde3/share/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME" ]; then
++ echo "Theme=/opt/kde3/share/apps/kdm/themes/$DISPLAYMANAGER_KDM_THEME"
++ echo "UseTheme=true"
++ echo "UseBackground=false"
++else
++ echo "UseTheme=false"
++ echo "UseBackground=true"
++fi
++
++echo "[Xdmcp]"
++if [ "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ]; then
++ echo "Enable=true"
++else
++ echo "Enable=false"
++fi
++
++echo "[X-:0-Core]"
++if [ "$DISPLAYMANAGER_AUTOLOGIN" ]; then
++ echo "AutoLoginEnable=true"
++ echo "AutoLoginUser=${DISPLAYMANAGER_AUTOLOGIN}"
++else
++ echo "AutoLoginEnable=false"
++fi
++if [ "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ]; then
++ echo "ServerArgsLocal="
++else
++ echo "ServerArgsLocal=-nolisten tcp"
++fi
++if [ "$DISPLAYMANAGER_PASSWORD_LESS_LOGIN" = "yes" ]; then
++ echo "NoPassEnable=true"
++ echo "NoPassAllUsers=true"
++else
++ echo "NoPassEnable=false"
++ echo "NoPassAllUsers=false"
++fi
++echo "AllowShutdown=${DISPLAYMANAGER_SHUTDOWN}"
++echo "AllowRootLogin=${ALLOW_ROOT_LOGIN}"
++echo "AllowNullPasswd=${ALLOW_ROOT_LOGIN}"
++
++echo "[X-*-Core]"
++echo "EchoMode=${ECHO_MODE}"
++
++echo "[General]"
++if [ "$DISPLAYMANAGER_STARTS_XSERVER" != "yes" ]; then
++ echo "StaticServers="
++fi
++
++) > ${kdmdir}/kdmrc.sysconfig
+
++++++ kdm-wordbreak.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,7 +1,7 @@
Index: kdm/kfrontend/kfdialog.cpp
-===================================================================
---- kdm/kfrontend/kfdialog.cpp (revision 539339)
-+++ kdm/kfrontend/kfdialog.cpp (working copy)
+================================================================================
+--- kdm/kfrontend/kfdialog.cpp
++++ kdm/kfrontend/kfdialog.cpp
@@ -28,6 +28,7 @@
#include
#include
++++++ khelpcenter-localindices.patch ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,6 +1,6 @@
--- khelpcenter/kcmhelpcenter.cpp
+++ khelpcenter/kcmhelpcenter.cpp
-@@ -321,6 +322,7 @@
+@@ -321,6 +321,7 @@
void KCMHelpCenter::load()
{
@@ -8,7 +8,7 @@
mIndexDirLabel->setText( Prefs::indexDirectory() );
mListView->clear();
-@@ -675,6 +677,12 @@
+@@ -675,6 +676,12 @@
enableButtonOK( count != 0 );
}
++++++ khelpcenter-use-susehelp.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,5 +1,5 @@
---- kdebase-3.5.1/khelpcenter/khelpcenter.desktop
-+++ kdebase-3.5.1/khelpcenter/khelpcenter.desktop
+--- kdebase-3.5.4/khelpcenter/khelpcenter.desktop
++++ kdebase-3.5.4/khelpcenter/khelpcenter.desktop
@@ -116,7 +116,7 @@
DocPath=khelpcenter/index.html
Type=Service
++++++ kicker-defaults.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,8 +1,21 @@
Index: kicker/libkicker/kickerSettings.kcfg
-===================================================================
---- kicker/libkicker/kickerSettings.kcfg (Revision 500974)
-+++ kicker/libkicker/kickerSettings.kcfg (Arbeitskopie)
-@@ -154,7 +154,7 @@
+================================================================================
+--- kcontrol/kcontrol/KControl.desktop
++++ kcontrol/kcontrol/KControl.desktop
+@@ -8,7 +8,9 @@
+ DocPath=kcontrol/index.html
+ X-KDE-StartupNotify=true
+
+-Name=Control Center
++GenericName=Configure Desktop
++GenericName[de]=Desktop-Einstellungen
++Name=Personal Settings
+ Name[af]=Beheer Sentrum
+ Name[ar]=مركز التحكم
+ Name[az]=İdarə Mərkəzi
+--- kicker/libkicker/kickerSettings.kcfg
++++ kicker/libkicker/kickerSettings.kcfg
+@@ -175,7 +175,7 @@
<entry name="MenuExtensions" key="Extensions" type="StringList" >
<label>Optional Menus</label>
@@ -11,8 +24,8 @@
</entry>
<entry name="RecentAppsStat" type="StringList" >
---- kicker/menuext/system/systemmenu.desktop 2006/03/31 11:48:12 1.1
-+++ kicker/menuext/system/systemmenu.desktop 2006/03/31 11:48:26
+--- kicker/menuext/system/systemmenu.desktop
++++ kicker/menuext/system/systemmenu.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
@@ -21,18 +34,3 @@
Name[af]=Stelsel Kieslys
Name[bg]=Системно меню
Name[bn]=সিস্টেম মেনু
-Index: kcontrol/kcontrol/KControl.desktop
-===================================================================
---- kcontrol/kcontrol/KControl.desktop (Revision 563426)
-+++ kcontrol/kcontrol/KControl.desktop (Arbeitskopie)
-@@ -6,7 +6,9 @@
- DocPath=kcontrol/index.html
- X-KDE-StartupNotify=true
-
--Name=Control Center
-+GenericName=Configure Desktop
-+GenericName[de]=Desktop-Einstellungen
-+Name=Personal Settings
- Name[af]=Beheer Sentrum
- Name[ar]=مركز التحكم
- Name[az]=İdarə Mərkəzi
++++++ kickoff.diff ++++++
++++ 19909 lines (skipped)
++++ between KDE/kdebase3/kickoff.diff
++++ and kdebase3/kickoff.diff
++++++ klipperrc.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,6 +1,6 @@
--- klipper/klipperrc.desktop
+++ klipper/klipperrc.desktop
-@@ -209,7 +209,7 @@
+@@ -212,7 +212,7 @@
Regexp=^https?://.
[Action_1/Command_0]
@@ -9,7 +9,7 @@
Description=Open with &Konqueror
Description[af]=Maak oop met Konqueror
Description[ar]=فتح ب&كونكيورر
-@@ -1496,7 +1496,7 @@
+@@ -1508,7 +1508,7 @@
Regexp=^ftp://.
[Action_6/Command_0]
++++++ kmenu-search-fs20050503-fixed.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -98,7 +98,7 @@
}
// create recent menu section
-@@ -741,3 +786,43 @@
+@@ -740,3 +785,43 @@
}
@@ -144,7 +144,7 @@
+}
--- kicker/kicker/ui/k_mnu.h
+++ kicker/kicker/ui/k_mnu.h
-@@ -73,6 +78,8 @@
+@@ -73,6 +73,8 @@
void slotSaveSession();
void slotRunCommand();
void slotEditUserContact();
@@ -153,7 +153,7 @@
void paletteChanged();
virtual void configChanged();
void updateRecent();
-@@ -89,6 +96,8 @@
+@@ -89,6 +91,8 @@
void doNewSession(bool lock);
void createRecentMenuItems();
virtual void clearSubmenus();
@@ -162,7 +162,7 @@
private:
QPopupMenu *sessionsMenu;
-@@ -101,6 +110,8 @@
+@@ -101,6 +105,8 @@
KActionCollection *actionCollection;
KBookmarkOwner *bookmarkOwner;
PopupMenuList dynamicSubMenus;
@@ -190,7 +190,7 @@
doInitialize();
}
-@@ -292,6 +295,10 @@
+@@ -296,6 +299,10 @@
int newId = insertItem(iconset, groupCaption, m, id++);
entryMap_.insert(newId, static_cast(g));
@@ -201,7 +201,7 @@
// We have to delete the sub menu our selves! (See Qt docs.)
subMenus.append(m);
}
-@@ -304,6 +311,7 @@
+@@ -308,6 +315,7 @@
}
KService::Ptr s(static_cast(e));
@@ -209,7 +209,7 @@
insertMenuItem(s, id++, -1, &suppressGenericNames, QString::null, specialTitle[s->name()], categoryIcon[s->name()] );
}
else if (e->isType(KST_KServiceSeparator))
-@@ -921,6 +929,8 @@
+@@ -898,6 +906,8 @@
delete *it;
}
subMenus.clear();
@@ -218,7 +218,7 @@
}
void PanelServiceMenu::selectFirstItem()
-@@ -945,3 +955,72 @@
+@@ -922,3 +932,72 @@
RecentlyLaunchedApps::the().m_bNeedToUpdate = true;
}
@@ -322,7 +322,7 @@
private:
void fillMenu( KServiceGroup::Ptr &_root, KServiceGroup::List &_list,
-@@ -116,6 +122,9 @@
+@@ -115,6 +121,9 @@
bool addmenumode_;
QPoint startPos_;
PopupMenuList subMenus;
++++++ kmenu-search-slowdown-fix.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.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
+@@ -774,6 +774,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 @@
+@@ -289,15 +297,13 @@
newSubMenu(g->name(), g->relPath(), this, g->name().utf8(), inlineHeaderName);
m->setCaption(groupCaption);
@@ -47,7 +57,8 @@
entryMap_.insert(newId, static_cast(g));
// This submenu will be searched when applying a search string
searchSubMenuIDs[m] = newId;
-@@ -428,5 +428,11 @@
+@@ -392,6 +398,12 @@
+
void PanelServiceMenu::configChanged()
{
+ const int iconSize = KickerSettings::menuEntryHeight();
@@ -59,7 +70,7 @@
deinitialize();
}
-@@ -483,9 +493,9 @@
+@@ -456,9 +468,9 @@
int newId;
if ( label.isEmpty() )
@@ -71,7 +82,7 @@
entryMap_.insert(newId, static_cast(s));
}
-@@ -1009,3 +1019,23 @@
+@@ -1001,3 +1013,23 @@
{
return hasSearchResults_;
}
@@ -95,9 +106,9 @@
+ 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
-@@ -125,9 +125,12 @@
+--- kicker/kicker/ui/service_mnu.h
++++ kicker/kicker/ui/service_mnu.h
+@@ -124,9 +124,12 @@
PanelServiceMenuMap searchSubMenuIDs;
bool hasSearchResults_;
std::set<int> searchMenuItems;
@@ -110,13 +121,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()
++++++ ksmserver-defaulttohalt.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- ksmserver/shutdowndlg.cpp
+++ ksmserver/shutdowndlg.cpp
-@@ -201,7 +201,7 @@
+@@ -202,7 +202,7 @@
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
++++++ ksmserver-suspend.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -29,8 +29,8 @@
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
--- ksmserver/shutdowndlg.cpp
+++ ksmserver/shutdowndlg.cpp
-@@ -37,12 +37,15 @@
- #include
+@@ -38,12 +38,15 @@
+ #include
#include
#include
+#include
@@ -45,7 +45,7 @@
#include
-@@ -233,8 +236,55 @@
+@@ -234,8 +237,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>" ) );
@@ -102,7 +102,7 @@
buttonlay->addStretch( 1 );
// Separator
-@@ -247,6 +297,41 @@
+@@ -248,6 +298,41 @@
}
++++++ ksmserver-tooltips.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,6 +1,6 @@
--- ksmserver/shutdowndlg.cpp
+++ ksmserver/shutdowndlg.cpp
-@@ -123,6 +123,7 @@
+@@ -126,6 +126,7 @@
// End session
KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End Current Session"), "undo"), frame );
@@ -8,7 +8,7 @@
QFont btnFont = btnLogout->font();
buttonlay->addWidget( btnLogout );
connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout()));
-@@ -131,6 +132,7 @@
+@@ -134,6 +135,7 @@
// Shutdown
KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit"), frame );
@@ -16,7 +16,7 @@
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
-@@ -139,6 +141,7 @@
+@@ -142,6 +144,7 @@
// Reboot
KSMDelayedPushButton* btnReboot = new KSMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload"), frame );
@@ -24,7 +24,7 @@
btnReboot->setFont( btnFont );
buttonlay->addWidget( btnReboot );
-@@ -163,7 +166,8 @@
+@@ -166,7 +169,8 @@
btnReboot->setPopup(targets);
connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) );
++++++ ksplashml.patch ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,6 +1,6 @@
--- ksplashml/kcmksplash/installer.cpp
+++ ksplashml/kcmksplash/installer.cpp
-@@ -469,6 +469,14 @@
+@@ -474,6 +474,14 @@
KMessageBox::error(this,i18n("Unable to start ksplashsimple."));
return;
}
++++++ ksysguardd-openslp.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -212,7 +212,7 @@
#include "modules.h"
#include "ksysguardd.h"
-@@ -344,6 +348,62 @@
+@@ -348,6 +352,62 @@
#endif
@@ -275,7 +275,7 @@
int createServerSocket()
{
int i = 1;
-@@ -398,6 +458,10 @@
+@@ -402,6 +462,10 @@
ServiceSocket = DNSServiceRefSockFD(Ref);
#endif
++++++ less_verbal_kdesu.patch ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,5 +1,5 @@
---- kdesu/kdesu/sudlg.cpp 2006/08/23 09:05:46 1.3
-+++ kdesu/kdesu/sudlg.cpp 2006/08/23 09:31:34
+--- kdesu/kdesu/sudlg.cpp
++++ kdesu/kdesu/sudlg.cpp
@@ -35,13 +35,9 @@
prompt = i18n("Please enter your password." );
} else {
++++++ lowdiskspace.patch ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,7 +1,7 @@
Index: kioslave/media/medianotifier/medianotifier.cpp
-===================================================================
---- kioslave/media/medianotifier/medianotifier.cpp (revision 568873)
-+++ kioslave/media/medianotifier/medianotifier.cpp (working copy)
+================================================================================
+--- kioslave/media/medianotifier/medianotifier.cpp
++++ kioslave/media/medianotifier/medianotifier.cpp
@@ -19,8 +19,11 @@
#include "medianotifier.h"
@@ -25,7 +25,7 @@
}
MediaNotifier::~MediaNotifier()
-@@ -304,4 +311,28 @@
+@@ -314,4 +321,28 @@
}
}
@@ -54,10 +54,8 @@
+}
+
#include "medianotifier.moc"
-Index: kioslave/media/medianotifier/medianotifier.h
-===================================================================
---- kioslave/media/medianotifier/medianotifier.h (revision 568873)
-+++ kioslave/media/medianotifier/medianotifier.h (working copy)
+--- kioslave/media/medianotifier/medianotifier.h
++++ kioslave/media/medianotifier/medianotifier.h
@@ -41,6 +41,7 @@
private slots:
++++++ mach_blass.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,7 +1,6 @@
-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
-@@ -34,6 +34,7 @@
+--- ksmserver/shutdowndlg.cpp
++++ ksmserver/shutdowndlg.cpp
+@@ -35,6 +35,7 @@
#include
#include
#include
@@ -9,7 +8,7 @@
#include
#include
-@@ -47,6 +48,9 @@
+@@ -48,6 +49,9 @@
#include "shutdowndlg.moc"
@@ -19,7 +18,7 @@
KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L;
KSMShutdownFeedback::KSMShutdownFeedback()
-@@ -54,33 +58,92 @@
+@@ -55,33 +59,92 @@
m_currentY( 0 )
{
setBackgroundMode( QWidget::NoBackground );
@@ -44,25 +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 );
-- QImage image = pixmap.convertToImage();
-- KImageEffect::blend( Qt::black, image, 0.4 );
-- KImageEffect::toGray( image, true );
-- pixmap.convertFromImage( image );
-- 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(),
@@ -119,22 +103,32 @@
+ //kdDebug() << "passed after bitBlt " << passed.elapsed() << endl;
+
+ if ( current_fade >= scale ) {
-+ if ( backgroundMode() == QWidget::NoBackground ) {
-+ setBackgroundMode( QWidget::NoBackground );
+ if ( backgroundMode() == QWidget::NoBackground ) {
+ setBackgroundMode( QWidget::NoBackground );
+- setBackgroundPixmap( m_root );
+ setBackgroundPixmap( copy );
-+ }
-+ return;
-+ }
-+
+ }
+ return;
+ }
+
+- KPixmap pixmap;
+- pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 );
+- QImage image = pixmap.convertToImage();
+- KImageEffect::blend( Qt::black, image, 0.4 );
+- KImageEffect::toGray( image, true );
+- pixmap.convertFromImage( image );
+- 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
++++++ make-wallpapers-hideable.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- kcontrol/background/bgdialog.cpp
+++ kcontrol/background/bgdialog.cpp
-@@ -522,14 +522,23 @@
+@@ -479,14 +479,23 @@
//search for .desktop files before searching for images without .desktop files
QStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true);
QStringList files;
@@ -26,7 +26,7 @@
if (imageCaption.isEmpty())
{
imageCaption = fileName;
-@@ -547,9 +556,8 @@
+@@ -504,9 +513,8 @@
rs = imageCaption + " (" + QString::number(n) + ')';
lrs = rs.lower();
}
@@ -37,7 +37,7 @@
#ifdef HAVE_LIBART
canLoadScaleable = true;
#endif
-@@ -563,7 +571,7 @@
+@@ -520,7 +528,7 @@
lst = m_pDirs->findAllResources("wallpaper", "*", false, true);
for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
{
++++++ media-iPod.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,7 +1,7 @@
Index: kioslave/media/mediamanager/halbackend.cpp
-===================================================================
---- kioslave/media/mediamanager/halbackend.cpp (Revision 553501)
-+++ kioslave/media/mediamanager/halbackend.cpp (Arbeitskopie)
+================================================================================
+--- kioslave/media/mediamanager/halbackend.cpp
++++ kioslave/media/mediamanager/halbackend.cpp
@@ -31,6 +31,7 @@
#include
#include
@@ -10,7 +10,7 @@
#define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted"))
#define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount"))
-@@ -507,6 +508,13 @@
+@@ -515,6 +516,13 @@
case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
{
medium->setIconName("ipod" + MOUNT_ICON_SUFFIX);
++++++ media_suse.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,8 +1,8 @@
Index: kioslave/media/mediamanager/halbackend.cpp
-===================================================================
---- kioslave/media/mediamanager/halbackend.cpp (Revision 551304)
-+++ kioslave/media/mediamanager/halbackend.cpp (Arbeitskopie)
-@@ -269,6 +269,12 @@
+================================================================================
+--- kioslave/media/mediamanager/halbackend.cpp
++++ kioslave/media/mediamanager/halbackend.cpp
+@@ -282,6 +282,12 @@
m_mediaList.addMedium(medium, allowNotification);
return;
}
@@ -15,7 +15,7 @@
}
void HALBackend::RemoveDevice(const char *udi)
-@@ -762,8 +768,12 @@
+@@ -786,8 +792,12 @@
bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL)
|| libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);
++++++ nsplugin-Preference.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -2,7 +2,7 @@
================================================================================
--- nsplugins/pluginscan.cpp
+++ nsplugins/pluginscan.cpp
-@@ -495,7 +495,7 @@
+@@ -506,7 +506,7 @@
ts << "Icon=netscape" << endl;
ts << "Comment=" << i18n("Netscape plugin viewer") << endl;
ts << "X-KDE-Library=libnsplugin" << endl;
++++++ short-menus.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.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 2006/06/12 15:02:30 1.1
-+++ kicker/kicker/ui/service_mnu.cpp 2006/06/12 15:04:53
+--- kicker/kicker/ui/service_mnu.cpp
++++ kicker/kicker/ui/service_mnu.cpp
@@ -111,6 +111,11 @@
QStringList suppressGenericNames = _root->suppressGenericNames();
@@ -168,9 +154,9 @@
+ const QString & aliasname, const QString & label /*=QString::NULL*/,
+ const QString & categoryIcon /*=QString::null*/)
{
- QString serviceName = aliasname.isEmpty() ? s->name():aliasname;
- // add comment
-@@ -339,7 +434,15 @@
+ QString serviceName = (aliasname.isEmpty() ? s->name() : aliasname).simplifyWhiteSpace();
+ QString comment = s->genericName().simplifyWhiteSpace();
+@@ -347,7 +442,15 @@
// to accelerators, replace them with two ampersands.
serviceName.replace("&", "&&");
@@ -187,8 +173,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,
@@ -199,3 +185,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.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -9,7 +9,7 @@
fi
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
-@@ -65,7 +65,7 @@
+@@ -62,7 +62,7 @@
kcminputrc Mouse cursorTheme ''
kcminputrc Mouse cursorSize ''
kpersonalizerrc General FirstLogin true
@@ -18,8 +18,8 @@
kcmrandrrc Display ApplyOnStartup false
kcmrandrrc [Screen0]
kcmrandrrc [Screen1]
-@@ -135,6 +135,16 @@
- done
+@@ -146,6 +146,16 @@
+ esac
fi
+case "$ksplashrc_ksplash_theme" in
@@ -35,7 +35,7 @@
# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
#
-@@ -258,7 +268,7 @@
+@@ -269,7 +279,7 @@
echo 'startkde: Starting up...' 1>&2
# run KPersonalizer before the session, if this is the first login
@@ -44,16 +44,16 @@
# start only dcopserver, don't start whole kdeinit (takes too long)
echo 'startkde: Running kpersonalizer...' 1>&2
dcopserver
-@@ -276,6 +286,8 @@
+@@ -287,6 +297,8 @@
case "$ksplashrc_ksplash_theme" in
None)
;; # nothing
+ ksplashx-*)
+ ;; # started earlier
Simple)
- ksplashsimple
- ;;
-@@ -334,7 +346,9 @@
+ if test "$kpersonalizerrc_general_firstlogin" = "true"; then
+ ksplashsimple
+@@ -362,7 +374,9 @@
# Clean up
kdeinit_shutdown
dcopserver_shutdown --wait
++++++ switch-applet-lock-logout.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -1,14 +1,14 @@
Index: kicker/applets/lockout/lockout.cpp
-===================================================================
---- kicker/applets/lockout/lockout.cpp (revision 462)
-+++ kicker/applets/lockout/lockout.cpp (working copy)
+================================================================================
+--- kicker/applets/lockout/lockout.cpp
++++ kicker/applets/lockout/lockout.cpp
@@ -71,8 +71,8 @@
layout->setMargin( 0 );
layout->setSpacing( 0 );
-+ logoutButton = new QToolButton( this, "logout");
- lockButton = new QToolButton( this, "lock");
-- logoutButton = new QToolButton( this, "logout");
+- lockButton = new QToolButton( this, "lock");
+ logoutButton = new QToolButton( this, "logout");
++ lockButton = new QToolButton( this, "lock");
lockButton->setBackgroundMode(X11ParentRelative);
logoutButton->setBackgroundMode(X11ParentRelative);
++++++ use-full-hinting-by-default.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:05.000000000 +0200
@@ -2,8 +2,8 @@
================================================================================
--- kcontrol/fonts/fonts.cpp
+++ kcontrol/fonts/fonts.cpp
-@@ -314,7 +314,7 @@
- KConfig kglobals("kdeglobals", false, false);
+@@ -321,7 +321,7 @@
+ kglobals.setReadDefaults( useDefaults );
kglobals.setGroup("General");
- hStyle=KXftConfig::Hint::Medium;
@@ -11,7 +11,7 @@
xft.setHintStyle(hStyle);
xft.apply(); // Save this setting
kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
-@@ -447,7 +447,7 @@
+@@ -439,7 +439,7 @@
if(hintingStyle->currentText()==i18n(KXftConfig::description((KXftConfig::Hint::Style)s).utf8()))
return (KXftConfig::Hint::Style)s;
@@ -22,7 +22,7 @@
--- kcontrol/krdb/krdb.cpp
+++ kcontrol/krdb/krdb.cpp
-@@ -507,7 +507,7 @@
+@@ -511,7 +511,7 @@
{
kglobals.setGroup("General");
++++++ xcursor.diff ++++++
--- /var/tmp/diff_new_pack.yNij8h/_old 2006-09-14 01:34:06.000000000 +0200
+++ /var/tmp/diff_new_pack.yNij8h/_new 2006-09-14 01:34:06.000000000 +0200
@@ -14,7 +14,7 @@
ThemePage::ThemePage( QWidget* parent, const char* name )
: QWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL )
{
-@@ -327,7 +334,7 @@
+@@ -333,7 +340,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 @@
+@@ -480,7 +487,7 @@
// Defaults in case there's no index.theme file or it lacks
// a name and a comment field.
QString name = *it;
++++++ xinerama.patch ++++++
++++ 646 lines (skipped)
++++ between KDE/kdebase3/xinerama.patch
++++ and kdebase3/xinerama.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org