Hello community, here is the log from the commit of package kdebase4-workspace checked in at Tue May 13 12:36:22 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-05-09 22:44:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-05-13 12:35:00.908887000 +0200 @@ -1,0 +2,25 @@ +Tue May 13 10:34:35 CEST 2008 - coolo@suse.de + +- use the server cmd from sysconfig + +------------------------------------------------------------------- +Mon May 12 20:54:43 CEST 2008 - llunak@suse.cz + +- fix possible ksmserver<->knotify deadlock during KDE startup + +------------------------------------------------------------------- +Mon May 12 18:10:37 CEST 2008 - llunak@suse.cz + +- fix crash preventing setting of time/date (bnc#386429) + +------------------------------------------------------------------- +Mon May 12 17:28:20 CEST 2008 - coolo@suse.de + +- set a preloader by default + +------------------------------------------------------------------- +Fri May 9 16:39:54 CEST 2008 - dmueller@suse.de + +- fix kdm4 requiring root for shutdown + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- kdm-focus-handling-fix.diff New: ---- kdm-delayed-popup.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.L15199/_old 2008-05-13 12:35:20.000000000 +0200 +++ /var/tmp/diff_new_pack.L15199/_new 2008-05-13 12:35:20.000000000 +0200 @@ -22,7 +22,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.0.4 -Release: 3 +Release: 6 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +59,16 @@ /usr/share/wallpapers %changelog +* Tue May 13 2008 coolo@suse.de +- use the server cmd from sysconfig +* Mon May 12 2008 llunak@suse.cz +- fix possible ksmserver<->knotify deadlock during KDE startup +* Mon May 12 2008 llunak@suse.cz +- fix crash preventing setting of time/date (bnc#386429) +* Mon May 12 2008 coolo@suse.de +- set a preloader by default +* Fri May 09 2008 dmueller@suse.de +- fix kdm4 requiring root for shutdown * Fri May 09 2008 stbinner@suse.de - add Kontact/KDE4 instead of Kontact/KDE3 to Kickoff (bnc#386374) - fix potential Plasma crash after deleting plasmoids (bnc#386462) ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.L15199/_old 2008-05-13 12:35:20.000000000 +0200 +++ /var/tmp/diff_new_pack.L15199/_new 2008-05-13 12:35:20.000000000 +0200 @@ -27,7 +27,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.0.4 -Release: 3 +Release: 6 %define rversion 4.0.4 Source0: kdebase-workspace-%rversion.tar.bz2 Source2: titlebar_decor.png @@ -62,9 +62,9 @@ Patch76: ksplashx-scale.diff Patch77: systemsettings-desktop.diff Patch78: kdm-use-radiobuttons.diff -Patch79: kdm-focus-handling-fix.diff Patch80: dateandtime.diff Patch81: oxygen-windeco-memory-usage.diff +Patch82: kdm-delayed-popup.diff %kde4_runtime_requires Conflicts: yast2-theme-NLD %if %suse_version > 1030 @@ -123,9 +123,9 @@ %patch76 %patch77 %patch78 -%patch79 %patch80 %patch81 +%patch82 %build %cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE4_KCHECKPASS_PAM_SERVICE=xdm @@ -143,7 +143,7 @@ popd sed -ri "s,.*%{_kde_config_dir}/kdm/backgroundrc,," filelists/kdm sed -ri "s,.*%{_kde_config_dir}/kdm/README,," filelists/kdm - sed -ri "s,.*(%{_kde_config_dir}/kdm/kdmrc),%config \1," filelists/kdm + sed -ri "s,.*(%{_kde_config_dir}/kdm/kdmrc),%config(noreplace) \1," filelists/kdm rm -f $RPM_BUILD_ROOT/%{_kde_config_dir}/kdm/README sed -ri "s,.*%{_kde_share_dir}/apps/kdm/themes/circles.*,," filelists/kdm sed -ri "s,.*%{_kde_share_dir}/apps/kdm/pics.*,," filelists/kdm @@ -225,7 +225,7 @@ %files -n kde4-kdm-branding-upstream %defattr(-,root,root) %doc COPYING -%_kde_config_dir/kdm/backgroundrc +%config(noreplace) %_kde_config_dir/kdm/backgroundrc %_kde_share_dir/apps/kdm/pics %_kde_share_dir/apps/kdm/themes/circles @@ -349,7 +349,7 @@ %post -n kde4-kdm /usr/bin/genkdmconf %{remove_and_set -n displaymanager KDM_SHUTDOWN} -if test -n "$KDM_SHUTDOWN" ; then +if test -n "$KDM_SHUTDOWN" -a "$KDM_SHUTDOWN" != "no"; then if test "$KDM_SHUTDOWN" = "local" ; then KDM_SHUTDOWN=all fi @@ -684,6 +684,16 @@ /usr/%_lib/kde4/kgreet_*.so %changelog +* Tue May 13 2008 coolo@suse.de +- use the server cmd from sysconfig +* Mon May 12 2008 llunak@suse.cz +- fix possible ksmserver<->knotify deadlock during KDE startup +* Mon May 12 2008 llunak@suse.cz +- fix crash preventing setting of time/date (bnc#386429) +* Mon May 12 2008 coolo@suse.de +- set a preloader by default +* Fri May 09 2008 dmueller@suse.de +- fix kdm4 requiring root for shutdown * Fri May 09 2008 stbinner@suse.de - add Kontact/KDE4 instead of Kontact/KDE3 to Kickoff (bnc#386374) - fix potential Plasma crash after deleting plasmoids (bnc#386462) ++++++ 4_0_BRANCH.diff ++++++ ++++ 1390 lines (skipped) ++++ between KDE/kdebase4-workspace/4_0_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_0_BRANCH.diff ++++++ dateandtime.diff ++++++ --- /var/tmp/diff_new_pack.L15199/_old 2008-05-13 12:35:20.000000000 +0200 +++ /var/tmp/diff_new_pack.L15199/_new 2008-05-13 12:35:20.000000000 +0200 @@ -1,5 +1,11 @@ ---- kcontrol/dateandtime/clock.desktop.sav 2008-04-04 13:59:39.000000000 +0200 -+++ kcontrol/dateandtime/clock.desktop 2008-04-10 17:51:14.000000000 +0200 +Subject: Administrator mode for setting date/time +From: Lubos Lunak +Patch-upstream: r805708, r806941 + +Allow the user to set the password without first running systemsettings as root. + +--- kcontrol/dateandtime/clock.desktop.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/clock.desktop 2008-05-12 18:02:40.000000000 +0200 @@ -6,8 +6,6 @@ X-KDE-ServiceTypes=KCModule X-DocPath=kcontrol/clock/index.html @@ -9,8 +15,8 @@ X-KDE-ParentApp=kcontrol #FIXME should this be in system settings when we can get to it through the panel? ---- kcontrol/dateandtime/dtime.cpp.sav 2008-03-18 17:58:56.000000000 +0100 -+++ kcontrol/dateandtime/dtime.cpp 2008-04-10 17:26:33.000000000 +0200 +--- kcontrol/dateandtime/dtime.cpp.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/dtime.cpp 2008-05-12 18:02:40.000000000 +0200 @@ -49,6 +49,8 @@ #include "dtime.moc" @@ -139,8 +145,8 @@ void Dtime::timeout() { // get current time ---- kcontrol/dateandtime/dtime.h.sav 2007-05-28 13:45:54.000000000 +0200 -+++ kcontrol/dateandtime/dtime.h 2008-04-10 16:07:34.000000000 +0200 +--- kcontrol/dateandtime/dtime.h.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/dtime.h 2008-05-12 18:02:40.000000000 +0200 @@ -53,7 +53,8 @@ class Dtime : public QWidget public: Dtime( QWidget *parent=0 ); @@ -160,8 +166,8 @@ int BufI; bool refresh; bool ontimeout; ---- kcontrol/dateandtime/main.cpp.sav 2008-01-09 13:19:10.000000000 +0100 -+++ kcontrol/dateandtime/main.cpp 2008-04-10 17:32:16.000000000 +0200 +--- kcontrol/dateandtime/main.cpp.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/main.cpp 2008-05-12 18:02:40.000000000 +0200 @@ -33,11 +33,15 @@ #include <kdialog.h> #include <kpluginfactory.h> @@ -221,8 +227,8 @@ tzone->load(); } - ---- kcontrol/dateandtime/tzone.cpp.sav 2007-09-18 19:00:24.000000000 +0200 -+++ kcontrol/dateandtime/tzone.cpp 2008-04-10 16:05:46.000000000 +0200 +--- kcontrol/dateandtime/tzone.cpp.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/tzone.cpp 2008-05-12 18:02:40.000000000 +0200 @@ -57,6 +57,8 @@ #include <sys/stat.h> #endif @@ -375,8 +381,8 @@ + KMessageBox::error( this, i18n("Error setting new timezone."), + i18n("Timezone Error")); +} ---- kcontrol/dateandtime/tzone.h.sav 2007-10-23 11:02:58.000000000 +0200 -+++ kcontrol/dateandtime/tzone.h 2008-04-10 16:03:48.000000000 +0200 +--- kcontrol/dateandtime/tzone.h.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/tzone.h 2008-05-12 18:02:40.000000000 +0200 @@ -37,7 +37,8 @@ class Tzone : public QGroupBox public: Tzone( QWidget *parent=0 ); @@ -387,8 +393,8 @@ void load(); Q_SIGNALS: ---- kcontrol/dateandtime/CMakeLists.txt.sav 2008-03-18 17:58:56.000000000 +0100 -+++ kcontrol/dateandtime/CMakeLists.txt 2008-04-10 17:55:01.000000000 +0200 +--- kcontrol/dateandtime/CMakeLists.txt.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/CMakeLists.txt 2008-05-12 18:02:40.000000000 +0200 @@ -13,6 +13,12 @@ target_link_libraries(kcm_clock ${KDE4_ install(TARGETS kcm_clock DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -402,9 +408,9 @@ ########### install files ############### ---- kcontrol/dateandtime/helper.cpp.sav 2008-04-10 14:12:38.000000000 +0200 -+++ kcontrol/dateandtime/helper.cpp 2008-04-10 17:32:04.000000000 +0200 -@@ -0,0 +1,285 @@ +--- kcontrol/dateandtime/helper.cpp.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/helper.cpp 2008-05-12 18:03:42.000000000 +0200 +@@ -0,0 +1,287 @@ +/* + * tzone.cpp + * @@ -439,6 +445,7 @@ +#include <time.h> +#include <unistd.h> + ++#include <kcomponentdata.h> +#include <kconfig.h> +#include <kconfiggroup.h> +#include <kdebug.h> @@ -678,6 +685,7 @@ + exit( ERROR_CALL ); + } + } ++ KComponentData data( "kcmdatetimehelper" ); + int ret = 0; // error code +// The order here is important + if( ntp ) @@ -690,8 +698,8 @@ + ret |= Tzone_save_reset(); + return ret; +} ---- kcontrol/dateandtime/helper.h.sav 2008-04-10 16:04:32.000000000 +0200 -+++ kcontrol/dateandtime/helper.h 2008-04-10 17:32:10.000000000 +0200 +--- kcontrol/dateandtime/helper.h.sav 2008-05-12 17:57:43.000000000 +0200 ++++ kcontrol/dateandtime/helper.h 2008-05-12 18:02:40.000000000 +0200 @@ -0,0 +1,40 @@ +/* + * main.h ++++++ kdm-delayed-popup.diff ++++++ ------------------------------------------------------------------------ r806085 | mueller | 2008-05-10 01:17:33 +0200 (Sat, 10 May 2008) | 2 lines make the delayed popup button work again like before ------------------------------------------------------------------------ --- kdm/kfrontend/kdmshutdown.cpp +++ kdm/kfrontend/kdmshutdown.cpp @@ -45,6 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include <QLabel> #include <QLineEdit> #include <QMenu> +#include <QStylePainter> #include <QStyle> #include <QTreeWidget> #include <QTreeWidgetItem> @@ -440,31 +441,42 @@ KDMDelayedPushButton::KDMDelayedPushButt connect( &popt, SIGNAL(timeout()), SLOT(slotTimeout()) ); } -void KDMDelayedPushButton::setPopup( QMenu *p ) +void KDMDelayedPushButton::setDelayedMenu( QMenu *p ) { pop = p; - setMenu( p ); +} + +void KDMDelayedPushButton::paintEvent( QPaintEvent * ) +{ + QStylePainter p(this); + QStyleOptionButton option; + initStyleOption(&option); + if (pop) + option.features |= QStyleOptionButton::HasMenu; + p.drawControl(QStyle::CE_PushButton, option); } void KDMDelayedPushButton::slotPressed() { if (pop) - popt.start( QApplication::startDragTime() ); + popt.start( style()->styleHint(QStyle::SH_ToolButton_PopupDelay, 0, this) ); } void KDMDelayedPushButton::slotReleased() { popt.stop(); + setMenu(0); } void KDMDelayedPushButton::slotTimeout() { popt.stop(); - pop->popup( mapToGlobal( rect().bottomLeft() ) ); + setMenu( pop ); + showMenu(); + setMenu( 0 ); setDown( false ); } - KDMSlimShutdown::KDMSlimShutdown( QWidget *_parent ) : inherited( _parent ) , targetList( 0 ) @@ -510,7 +522,7 @@ KDMSlimShutdown::KDMSlimShutdown( QWidge "%1 (current)", t ) : t ))->setData( i ); } - btnReboot->setPopup( targets ); + btnReboot->setDelayedMenu( targets ); connect( targets, SIGNAL(triggered( QAction * )), SLOT(slotReboot( QAction * )) ); } --- kdm/kfrontend/kdmshutdown.h +++ kdm/kfrontend/kdmshutdown.h @@ -140,13 +140,16 @@ class KDMDelayedPushButton : public KPus public: KDMDelayedPushButton( const KGuiItem &item, QWidget *parent ); - void setPopup( QMenu *pop ); + void setDelayedMenu( QMenu *pop ); private Q_SLOTS: void slotTimeout(); void slotPressed(); void slotReleased(); + protected: + virtual void paintEvent( QPaintEvent * ); + private: QMenu *pop; QTimer popt; ++++++ kdm-sysconfig-values.diff ++++++ ++++ 889 lines (skipped) ++++ between KDE/kdebase4-workspace/kdm-sysconfig-values.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/kdm-sysconfig-values.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org