Hello community, here is the log from the commit of package kdebase3 checked in at Thu Nov 2 20:29:49 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-11-02 15:27:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-11-02 15:38:29.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 2 15:38:25 CET 2006 - stbinner@suse.de + +- show complete wallpaper name in desktop configuration (#103202) +- let lockout applet call again kdm dialog on left click (#215058) + +------------------------------------------------------------------- New: ---- bgdialog.cpp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.dXv0Bp/_old 2006-11-02 20:29:34.000000000 +0100 +++ /var/tmp/diff_new_pack.dXv0Bp/_new 2006-11-02 20:29:34.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 32 +Release: 33 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -178,6 +178,7 @@ Patch171: khotkeys-multimedia-action2.diff Patch172: optional-kwin.diff Patch173: suspend-unmount.diff +Patch174: bgdialog.cpp.patch Provides: kdebase %description @@ -368,7 +369,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 161 +Release: 162 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -518,6 +519,7 @@ %patch171 %patch172 %patch173 +%patch174 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -1475,6 +1477,9 @@ %endif %changelog -n kdebase3 +* Thu Nov 02 2006 - stbinner@suse.de +- show complete wallpaper name in desktop configuration (#103202) +- let lockout applet call again kdm dialog on left click (#215058) * Thu Nov 02 2006 - coolo@suse.de - don't crash on 8bit displays (#210209) - don't pollute log/messages with debug (#217035) ++++++ applet-lock-logout.diff ++++++ --- /var/tmp/diff_new_pack.dXv0Bp/_old 2006-11-02 20:29:35.000000000 +0100 +++ /var/tmp/diff_new_pack.dXv0Bp/_new 2006-11-02 20:29:35.000000000 +0100 @@ -1,51 +1,21 @@ -Index: kicker/applets/lockout/lockout.h -=================================================================== ---- kicker/applets/lockout/lockout.h (revision 597510) -+++ kicker/applets/lockout/lockout.h (working copy) -@@ -32,6 +32,7 @@ - private slots: - void lock(); - void logout(); -+ void logoutTimed(); - - void slotLockPrefs(); - void slotLogoutPrefs(); Index: kicker/applets/lockout/lockout.cpp =================================================================== ---- kicker/applets/lockout/lockout.cpp (revision 597510) +--- kicker/applets/lockout/lockout.cpp (revision 601166) +++ kicker/applets/lockout/lockout.cpp (working copy) -@@ -71,8 +71,8 @@ +@@ -71,8 +71,14 @@ layout->setMargin( 0 ); layout->setSpacing( 0 ); -+ logoutButton = new QToolButton( this, "logout"); - lockButton = new QToolButton( this, "lock"); +- lockButton = new QToolButton( this, "lock"); - logoutButton = new QToolButton( this, "logout"); ++ if (conf->readBoolEntry("OriginalLayout",false)) { ++ lockButton = new QToolButton( this, "lock"); ++ logoutButton = new QToolButton( this, "logout"); ++ } ++ else { ++ logoutButton = new QToolButton( this, "logout"); ++ lockButton = new QToolButton( this, "lock"); ++ } lockButton->setBackgroundMode(X11ParentRelative); logoutButton->setBackgroundMode(X11ParentRelative); -@@ -92,7 +92,7 @@ - logoutButton->setAutoRaise( bTransparent ); - - connect( lockButton, SIGNAL( clicked() ), SLOT( lock() )); -- connect( logoutButton, SIGNAL( clicked() ), SLOT( logout() )); -+ connect( logoutButton, SIGNAL( clicked() ), SLOT( logoutTimed() )); - - lockButton->installEventFilter( this ); - logoutButton->installEventFilter( this ); -@@ -163,6 +163,15 @@ - kapp->requestShutDown(); - } - -+void Lockout::logoutTimed() -+{ -+ QByteArray params; -+ QDataStream stream(params, IO_WriteOnly); -+ stream << 0 << -1 << ""; -+ -+ kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,QString)", params); -+} -+ - void Lockout::mousePressEvent(QMouseEvent* e) - { - propagateMouseEvent(e); ++++++ bgdialog.cpp.patch ++++++ --- kcontrol/background/bgdialog.cpp.sav 2006-10-31 18:12:41.000000000 +0100 +++ kcontrol/background/bgdialog.cpp 2006-10-31 18:13:23.000000000 +0100 @@ -494,8 +494,6 @@ void BGDialog::loadWallpaperFilesList() imageCaption = KStringHandler::capwords(imageCaption); } - imageCaption = KStringHandler::rEmSqueeze(imageCaption, m_urlWallpaperBox->fontMetrics(), 11); - // avoid name collisions QString rs = imageCaption; QString lrs = rs.lower(); @@ -544,8 +542,6 @@ void BGDialog::loadWallpaperFilesList() imageCaption = KStringHandler::capwords(imageCaption); } - imageCaption = KStringHandler::rEmSqueeze(imageCaption, m_urlWallpaperBox->fontMetrics(), 11); - // avoid name collisions QString rs = imageCaption; QString lrs = rs.lower(); @@ -594,7 +590,7 @@ void BGDialog::setWallpaper(const QStrin i--; comboWallpaper->removeItem(i); } - comboWallpaper->insertItem(KStringHandler::rEmSqueeze(imageCaption, m_urlWallpaperBox->fontMetrics(), 11)); + comboWallpaper->insertItem(imageCaption); m_wallpaper[s] = i; comboWallpaper->setCurrentItem(i); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org