Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory
checked in at Tue May 18 00:04:43 CEST 2010.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-05-05 22:31:14.000000000 +0200
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2010-05-18 00:01:18.707904000 +0200
@@ -1,0 +2,10 @@
+Mon May 17 12:57:27 UTC 2010 - llunak@novell.com
+
+- update 4_4_BRANCH.diff: various fixes, translation updates
+
+-------------------------------------------------------------------
+Fri May 14 14:54:27 UTC 2010 - llunak@novell.com
+
+- update 4_4_BRANCH.diff: ignore stale utmp entries (bnc#600812)
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
python-kdebase4.changes: same change
calling whatdependson for head-i586
Old:
----
plasma-lock_logout_order.diff
plasma-obvious-configure.diff
windeco-color.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:49.000000000 +0200
@@ -30,7 +30,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.4.3
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:49.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: NetworkManager-devel bluez-devel libkde4-devel libqimageblitz-devel
BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel
BuildRequires: audit-devel libQtWebKit-devel libsoprano-devel pam-devel python soprano-backend-redland
-BuildRequires: libkdepimlibs4-devel libknotificationitem-devel
+BuildRequires: libkdepimlibs4-devel
%if %suse_version > 1100
BuildRequires: google-gadgets-devel
%endif
@@ -40,7 +40,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.4.3
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
Source1: rcksysguardd
Source2: titlebar_decor.png
@@ -66,7 +66,6 @@
Patch74: lowdiskspace.patch
Patch77: systemsettings-desktop.diff
Patch82: rotate-wacom-pointers.diff
-Patch85: windeco-color.diff
Patch88: kde4-migrate.diff
Patch94: systemsettings-root-kcm.diff
Patch97: suspend-lock.diff
@@ -77,7 +76,6 @@
#Bug: bnc#462478
Patch99: kdm-long-xserver-timeout.diff
Patch103: plasma-branding-defaults.diff
-Patch104: plasma-lock_logout_order.diff
# slightly modified copy of standard desktop containment
Patch105: plasma-plaindesktop.diff
Patch106: plasma-dashboard-leave.diff
@@ -85,7 +83,6 @@
Patch108: plasma-panel-resize-hint.diff
Patch109: plasma-wallpaper-description.diff
Patch111: plasma-new-default-panel.diff
-Patch112: plasma-obvious-configure.diff
Patch115: plasma-dont-hide-jobs.diff
Patch123: kdm-fix-generic-greeter.diff
Patch124: kdm-fix-labelcolors.diff
@@ -143,18 +140,16 @@
###KDE44: still needed?
#%patch111
# prepare a patched copy of the default containment
-###KDE44 does not exist anymore
-#pushd plasma/containments
-#cp -a desktop plaindesktop
-#mv plaindesktop/plasma-containment-desktop.desktop plaindesktop/plasma-containment-plaindesktop.desktop
-#sed -i -re '/(Name|Comment)\[/d' plaindesktop/plasma-containment-plaindesktop.desktop
-#popd
+pushd plasma/desktop/containments
+cp -a desktop plaindesktop
+mv plaindesktop/plasma-containment-desktop.desktop plaindesktop/plasma-containment-plaindesktop.desktop
+sed -i -re '/(Name|Comment)\[/d' plaindesktop/plasma-containment-plaindesktop.desktop
+popd
###KDE44: rediff!
#%patch8
%patch18
%patch60
-###KDE44: whole code seems to have changed, needed?
-#%patch62
+%patch62
%patch63
%patch64
%patch65
@@ -167,30 +162,18 @@
%patch74
%patch77
%patch82
-###KDE44: rediff!
-#%patch85
%patch88
%patch94
%patch97
%patch98
%patch99
%patch103
-###KDE44: rediff!
-#%patch104
-###KDE44: rediff!
-#%patch105
-###KDE44: rediff!
-#%patch106
-###KDE44: rediff!
-#%patch107
-###KDE44: rediff!
-#%patch108
-###KDE44: rediff!
-#%patch109
-###KDE44: rediff!
-#%patch112
-###KDE44: rediff!
-#%patch115
+%patch105
+%patch106
+%patch107
+%patch108
+%patch109
+%patch115
%patch123 -p1
%patch124 -p1
%patch125
@@ -411,7 +394,6 @@
Group: System/GUI/KDE
Summary: KDE Window Manager
Provides: windowmanager
-Requires: kdm = %version
%kde4_runtime_requires
%if %suse_version == 1110
Requires: %{name}-branding = 11.1
@@ -680,6 +662,7 @@
%_kde4_appsdir/kconf_update/convertShortcuts.pl
%_kde4_appsdir/kconf_update/move_session_config.sh
%_kde4_appsdir/kconf_update/*.upd
+%exclude %_kde4_appsdir/kconf_update/kwin*.upd
%_kde4_appsdir/kcontrol
%_kde4_appsdir/kdisplay
%_kde4_appsdir/kfontinst
@@ -741,7 +724,7 @@
%_kde4_servicesdir/plasma-applet-*.desktop
%_kde4_servicesdir/plasma-battery-default.desktop
%_kde4_servicesdir/plasma-containment-desktop.desktop
-#%_kde4_servicesdir/plasma-containment-plaindesktop.desktop
+%_kde4_servicesdir/plasma-containment-plaindesktop.desktop
%_kde4_servicesdir/plasma-containment-panel.desktop
%_kde4_servicesdir/plasma-containment-saverdesktop.desktop
%_kde4_servicesdir/plasma-dataengine-*.desktop
@@ -750,6 +733,9 @@
%_kde4_servicesdir/plasma-runner-*.desktop
%_kde4_servicesdir/plasma-engine-*.desktop
%_kde4_servicesdir/plasma-scriptengine-*.desktop
+%if %suse_version > 1100
+%exclude %_kde4_servicesdir/plasma-scriptengine-googlegadgets.desktop
+%endif
%_kde4_servicesdir/plasma-tasks-default.desktop
%_kde4_servicesdir/plasma-wallpaper-color.desktop
%_kde4_servicesdir/plasma-containment-netpanel.desktop
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:49.000000000 +0200
@@ -29,7 +29,7 @@
Summary: Python bindings for KDE 4 desktop shell
Url: http://www.kde.org/
Version: 4.4.3
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: python-kde4 = %{version}
++++++ 4_4_BRANCH.diff ++++++
++++ 4611 lines (skipped)
++++ between KDE/kdebase4-workspace/4_4_BRANCH.diff
++++ and kdebase4-workspace/4_4_BRANCH.diff
++++++ kdm-cope-with-new-grub.diff ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:54.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:54.000000000 +0200
@@ -2,27 +2,39 @@
===================================================================
--- kdm/backend/bootman.c.orig
+++ kdm/backend/bootman.c
-@@ -130,19 +130,14 @@ setGrub( const char *opt, SdRec *sdr )
+@@ -133,31 +133,14 @@ setGrub( const char *opt, SdRec *sdr )
static void
commitGrub( void )
{
-- FILE *f;
-- int pid;
-- static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
--
-+ char buffer[PATH_MAX];
-+
++ char buffer[PATH_MAX];
++
if (sdRec.bmstamp != mTime( GRUB_MENU ) &&
setGrub( sdRec.osname, &sdRec ) != BO_OK)
return;
-- args[0] = grub;
-- if ((f = pOpen( (char **)args, 'w', &pid ))) {
-- fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex );
-- pClose( f, &pid );
+- if (grubSetDefault) {
+- /* The grub-set-default command must be used, which is
+- * not so good because there is no way of setting an
+- * entry for the next boot only. */
+- char index[16];
+- const char *args[] = { grubSetDefault, index, 0 };
+- sprintf( index, "%d", sdRec.osindex );
+- runAndWait( (char **)args, environ );
+- } else {
+- /* The grub shell can be used with `savedefault'.
+- * That requires a (widely distributed) patch to grub, e.g.
+- * grub-0.97-once.patch. It won't work with a vanilla grub.*/
+- FILE *f;
+- int pid;
+- static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
+- args[0] = grub;
+- if ((f = pOpen( (char **)args, 'w', &pid ))) {
+- fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex );
+- pClose( f, &pid );
+- }
- }
+ snprintf(buffer, PATH_MAX, "/usr/sbin/grubonce %d", sdRec.osindex);
-+ system(buffer);
++ system(buffer);
}
static char *lilo;
++++++ plasma-dashboard-leave.diff ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:55.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:55.000000000 +0200
@@ -1,17 +1,18 @@
-Index: plasma/shells/desktop/dashboardview.cpp
-===================================================================
---- plasma/shells/desktop/dashboardview.cpp.orig
-+++ plasma/shells/desktop/dashboardview.cpp
-@@ -161,6 +161,12 @@ void DashboardView::appletBrowserDestroy
- bool DashboardView::eventFilter(QObject *watched, QEvent *event)
- {
- if (watched != m_appletBrowser) {
+--- plasma/desktop/shell/dashboardview.cpp.orig
++++ plasma/desktop/shell/dashboardview.cpp
+@@ -219,6 +219,15 @@ bool DashboardView::eventFilter(QObject
+ widgetExplorer->setPos(0, containment()->geometry().height() - widgetExplorer->geometry().height());
+ }
+
++ if (watched != (QObject*)m_widgetExplorer.data()) {
+ if (event->type() == QEvent::MouseButtonPress) {
+ QMouseEvent *me = static_cast(event);
+ if (me->button() == Qt::LeftButton) {
+ hideView();
+ }
+ }
- return false;
- }
++ }
++
+ return false;
+ }
++++++ plasma-dont-hide-jobs.diff ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:55.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:55.000000000 +0200
@@ -1,42 +1,33 @@
---- plasma/applets/systemtray/ui/applet.cpp.sav 2009-06-23 13:15:05.000000000 +0200
-+++ plasma/applets/systemtray/ui/applet.cpp 2009-10-07 16:48:47.851910189 +0200
-@@ -117,6 +117,7 @@
- static SystemTray::Manager *s_manager;
- static int s_managerUsage;
- int autoHideTimeout;
-+ int autoHideJobsTimeout;
- int timerId;
-
- Ui::ProtocolsConfig notificationUi;
-@@ -214,6 +215,11 @@
- d->autoHideTimeout = 0;
+--- plasma/generic/applets/systemtray/ui/applet.h.sav 2010-01-20 00:19:14.000000000 +0100
++++ plasma/generic/applets/systemtray/ui/applet.h 2010-05-11 14:36:12.741927397 +0200
+@@ -112,6 +112,7 @@ private:
+ Plasma::Svg *m_icons;
+ JobTotalsWidget *m_jobSummaryWidget;
+ int m_autoHideTimeout;
++ int m_autoHideJobsTimeout;
+ int m_timerId;
+
+ QHash > m_notificationsForApp;
+--- plasma/generic/applets/systemtray/ui/applet.cpp.sav 2010-05-11 14:34:21.000000000 +0200
++++ plasma/generic/applets/systemtray/ui/applet.cpp 2010-05-11 14:39:07.082055588 +0200
+@@ -214,6 +214,11 @@
+ m_autoHideTimeout = 0;
}
-+ d->autoHideJobsTimeout = d->autoHideTimeout;
++ m_autoHideJobsTimeout = m_autoHideTimeout;
+ if (config().readEntry("DisableAutoHideJobs", true)) {
-+ d->autoHideJobsTimeout = 0;
++ m_autoHideJobsTimeout = 0;
+ }
+
- d->shownCategories.insert(Task::UnknownCategory);
-
- //destroy any item in the systray, that doesn't belong to the completedJobsGroup, since running
-@@ -534,6 +540,10 @@
- } else {
- d->autoHideTimeout = 0;
- }
-+ d->autoHideJobsTimeout = d->autoHideTimeout;
-+ if (cg.readEntry("DisableAutoHideJobs", true)) {
-+ d->autoHideJobsTimeout = 0;
-+ }
-
KConfigGroup globalCg = globalConfig();
- globalCg.writeEntry("ShowJobs", d->notificationUi.showJobs->isChecked());
-@@ -610,7 +620,7 @@
+ bool createExtenderTask = false;
+ if (globalCg.readEntry("ShowJobs", true)) {
+@@ -799,7 +804,7 @@
extenderItem->config().writeEntry("type", "job");
extenderItem->setWidget(new JobWidget(job, extenderItem));
-- showPopup(d->autoHideTimeout);
-+ showPopup(d->autoHideJobsTimeout);
+- showPopup(m_autoHideTimeout);
++ showPopup(m_autoHideJobsTimeout);
extenderItem->setGroup(extender()->group("jobGroup"));
}
++++++ plasma-kickoff-newly-collapsing.diff ++++++
++++ 626 lines (skipped)
++++ between KDE/kdebase4-workspace/plasma-kickoff-newly-collapsing.diff
++++ and kdebase4-workspace/plasma-kickoff-newly-collapsing.diff
++++++ plasma-notifications-kill-timer.diff ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:55.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:55.000000000 +0200
@@ -2,13 +2,8 @@
index 898b4f6..b75f2bd 100644
--- a/plasma/generic/dataengines/notifications/notificationsengine.cpp
+++ b/plasma/generic/dataengines/notifications/notificationsengine.cpp
-@@ -206,10 +206,12 @@ uint NotificationsEngine::Notify(const Q
-
- void NotificationsEngine::timerEvent(QTimerEvent *event)
- {
-+ // qDebug() << "Timer: " << event->timerId();
- const QString source = m_timeouts.value(event->timerId());
- if (!source.isEmpty()) {
+@@ -211,6 +211,7 @@
+ killTimer(event->timerId());
m_sourceTimers.remove(source);
m_timeouts.remove(event->timerId());
+ killTimer(event->timerId());
++++++ plasma-panel-resize-hint.diff ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:55.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:55.000000000 +0200
@@ -1,36 +1,34 @@
-Index: plasma/shells/desktop/panelcontroller.cpp
-===================================================================
---- plasma/shells/desktop/panelcontroller.cpp.orig
-+++ plasma/shells/desktop/panelcontroller.cpp
-@@ -949,6 +949,7 @@ void PanelController::mouseMoveFilter(QM
+--- plasma/desktop/shell/panelcontroller.cpp.orig
++++ plasma/desktop/shell/panelcontroller.cpp
+@@ -594,6 +594,7 @@ void PanelController::mouseMoveFilter(QM
newX - screenGeom.left() <= screenGeom.width()/3) {
move(newX, pos().y());
- d->resizeFrameHeight(geometry().left() - screenGeom.left());
-+ d->sizeTool->setText(i18n("Width: %1", screenGeom.left() + (mapToGlobal(event->pos()).x() - d->startDragPos.x())));
+ resizeFrameHeight(geometry().left() - screenGeom.left());
++ m_sizeTool->setText(i18n("Width: %1", screenGeom.left() + (mapToGlobal(event->pos()).x() - m_startDragPos.x())));
}
break;
}
-@@ -958,6 +959,7 @@ void PanelController::mouseMoveFilter(QM
+@@ -603,6 +604,7 @@ void PanelController::mouseMoveFilter(QM
newX + width() - screenGeom.left() >= 2*(screenGeom.width()/3)) {
move(newX, pos().y());
- d->resizeFrameHeight(screenGeom.right() - geometry().right());
-+ d->sizeTool->setText(i18n("Width: %1", screenGeom.right() - (mapToGlobal(event->pos()).x() - d->startDragPos.x()) - width() + 1));
+ resizeFrameHeight(screenGeom.right() - geometry().right());
++ m_sizeTool->setText(i18n("Width: %1", screenGeom.right() - (mapToGlobal(event->pos()).x() - m_startDragPos.x()) - width() + 1));
}
break;
}
-@@ -967,6 +969,7 @@ void PanelController::mouseMoveFilter(QM
+@@ -612,6 +614,7 @@ void PanelController::mouseMoveFilter(QM
newY - screenGeom.top()<= screenGeom.height()/3) {
move(pos().x(), newY);
- d->resizeFrameHeight(geometry().top() - screenGeom.top());
-+ d->sizeTool->setText(i18n("Height: %1", screenGeom.top() + (mapToGlobal(event->pos()).y() - d->startDragPos.y())));
+ resizeFrameHeight(geometry().top() - screenGeom.top());
++ m_sizeTool->setText(i18n("Height: %1", screenGeom.top() + (mapToGlobal(event->pos()).y() - m_startDragPos.y())));
}
break;
}
-@@ -977,6 +980,7 @@ void PanelController::mouseMoveFilter(QM
+@@ -622,6 +625,7 @@ void PanelController::mouseMoveFilter(QM
newY + height() - screenGeom.top() >= 2*(screenGeom.height()/3)) {
move(pos().x(), newY);
- d->resizeFrameHeight(screenGeom.bottom() - geometry().bottom());
-+ d->sizeTool->setText(i18n("Height: %1", screenGeom.bottom() - (mapToGlobal(event->pos()).y() - d->startDragPos.y()) - height() + 1));
+ resizeFrameHeight(screenGeom.bottom() - geometry().bottom());
++ m_sizeTool->setText(i18n("Height: %1", screenGeom.bottom() - (mapToGlobal(event->pos()).y() - m_startDragPos.y()) - height() + 1));
}
break;
}
++++++ plasma-plaindesktop.diff ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:55.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:55.000000000 +0200
@@ -1,37 +1,32 @@
---- plasma/containments/plaindesktop/CMakeLists.txt 2009-01-11 11:37:56.000000000 +0100
-+++ plasma/containments/plaindesktop/CMakeLists.txt 2009-05-15 14:07:28.000000000 +0200
-@@ -9,13 +9,12 @@
- set(screensaver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/dbus/org.freedesktop.ScreenSaver.xml)
- QT4_ADD_DBUS_INTERFACE(desktop_SRCS ${screensaver_xml} screensaver_interface)
+--- plasma/desktop/containments/plaindesktop/CMakeLists.txt.sav 2009-09-16 13:40:52.000000000 +0200
++++ plasma/desktop/containments/plaindesktop/CMakeLists.txt 2010-05-10 16:46:34.260930438 +0200
+@@ -3,9 +3,8 @@ set(desktop_SRCS
+ itemspace.cpp
+ desktoplayout.cpp)
-kde4_add_plugin(plasma_containment_desktop ${desktop_SRCS})
-+kde4_add_plugin(plasma_containment_plaindesktop ${desktop_SRCS})
- if(WIN32)
-target_link_libraries(plasma_containment_desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
++kde4_add_plugin(plasma_containment_plaindesktop ${desktop_SRCS})
+target_link_libraries(plasma_containment_plaindesktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
- else(WIN32)
--target_link_libraries(plasma_containment_desktop ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} )
-+target_link_libraries(plasma_containment_plaindesktop ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} )
- endif(WIN32)
-install(TARGETS plasma_containment_desktop DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-containment-desktop.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(FILES plasma_desktop_containment.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules)
+install(TARGETS plasma_containment_plaindesktop DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES plasma-containment-plaindesktop.desktop DESTINATION ${SERVICES_INSTALL_DIR})
---- plasma/containments/plaindesktop/desktop.cpp 2009/11/20 20:40:57 1.1
-+++ plasma/containments/plaindesktop/desktop.cpp 2009/11/20 20:41:10
-@@ -59,7 +59,7 @@
+--- plasma/desktop/containments/plaindesktop/desktop.cpp.sav 2009-09-16 13:40:52.000000000 +0200
++++ plasma/desktop/containments/plaindesktop/desktop.cpp 2010-05-10 16:45:33.882929026 +0200
+@@ -27,7 +27,7 @@
using namespace Plasma;
DefaultDesktop::DefaultDesktop(QObject *parent, const QVariantList &args)
- : Containment(parent, args),
+ : Containment(parent, args, false),
- m_addPanelsMenu(0),
- m_addPanelAction(0),
- m_runCommandAction(0),
---- plasma/containments/plaindesktop/plasma-containment-plaindesktop.desktop 2009-05-15 14:15:33.000000000 +0200
-+++ plasma/containments/plaindesktop/plasma-containment-plaindesktop.desktop 2009-05-15 14:07:28.000000000 +0200
+ dropping(false)
+ {
+ qRegisterMetaType<QImage>("QImage");
+--- plasma/desktop/containments/plaindesktop/plasma-containment-plaindesktop.desktop 2009-05-15 14:15:33.000000000 +0200
++++ plasma/desktop/containments/plaindesktop/plasma-containment-plaindesktop.desktop 2009-05-15 14:07:28.000000000 +0200
@@ -1,17 +1,17 @@
[Desktop Entry]
# ctxt: plasma containment
@@ -56,11 +51,9 @@
X-KDE-PluginInfo-Category=Containments
Index: plasma/containments/CMakeLists.txt
-===================================================================
---- plasma/containments/CMakeLists.txt 2009/11/20 20:40:06 1.1
-+++ plasma/containments/CMakeLists.txt 2009/11/20 20:41:10
-@@ -1,3 +1,4 @@
+--- plasma/desktop/containments/CMakeLists.txt.sav 2009-09-16 13:40:52.000000000 +0200
++++ plasma/desktop/containments/CMakeLists.txt 2010-05-10 16:44:59.490931083 +0200
+@@ -1,2 +1,3 @@
add_subdirectory(desktop)
add_subdirectory(panel)
- add_subdirectory(screensaver)
+add_subdirectory(plaindesktop)
++++++ plasma-wallpaper-description.diff ++++++
--- /var/tmp/diff_new_pack.hwhDWI/_old 2010-05-18 00:01:55.000000000 +0200
+++ /var/tmp/diff_new_pack.hwhDWI/_new 2010-05-18 00:01:55.000000000 +0200
@@ -1,8 +1,6 @@
-Index: plasma/wallpapers/image/backgroundlistmodel.cpp
-===================================================================
---- plasma/wallpapers/image/backgroundlistmodel.cpp (revision 1024127)
-+++ plasma/wallpapers/image/backgroundlistmodel.cpp (working copy)
-@@ -20,6 +20,7 @@
+--- plasma/generic/wallpapers/image/backgroundlistmodel.cpp.sav 2009-09-16 13:40:55.000000000 +0200
++++ plasma/generic/wallpapers/image/backgroundlistmodel.cpp 2010-05-11 14:21:34.442041261 +0200
+@@ -18,6 +18,7 @@
#include
#include <KProgressDialog>
#include <KStandardDirs>
@@ -10,7 +8,7 @@
#include
#include
-@@ -349,6 +350,13 @@
+@@ -347,6 +348,13 @@ void BackgroundFinder::start()
m_paths.append(wp.filePath());
}
} else if (suffixes.contains(wp.suffix().toLower()) && (!m_container || !m_container->contains(wp.filePath()))) {
@@ -24,7 +22,7 @@
//kDebug() << "adding" << wp.filePath() << setLabel;
if (setLabel) {
progress->setLabelText(i18n("Finding images for the wallpaper slideshow.") + "\n\n" +
-@@ -358,6 +366,7 @@
+@@ -356,6 +364,7 @@ void BackgroundFinder::start()
//kDebug() << " adding image file" << wp.filePath();
++count;
m_papersFound << wp.filePath();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org