Hello community, here is the log from the commit of package kdebase3 checked in at Sun Mar 18 06:47:13 CET 2007. -------- --- KDE/kdebase3/kdebase3.changes 2007-03-09 19:07:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-03-16 16:20:58.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Mar 16 16:18:08 CET 2007 - stbinner@suse.de + +- update Kickoff from SVN: + * don't allow "Switch/Reboot to foo" items as Favorites + * distinct icons for suspend to ram and disk (#229966) +- fix "cannot login with KDM after wrong password" (#229245) +- fix kcmkdm not defaulting to Grub (#230715) + +------------------------------------------------------------------- New: ---- kcmkdm-default-grub.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.eW1296/_old 2007-03-18 06:46:45.000000000 +0100 +++ /var/tmp/diff_new_pack.eW1296/_new 2007-03-18 06:46:45.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.6 -Release: 15 +Release: 17 %define kde_version 3.5.6 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -116,7 +116,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@599257 $BASE/branches/work/coolos_kdm | sed -e "s,^+++ ,+++ kdm/" +# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@599257 $BASE/branches/work/coolos_kdm | sed -e "s,^+++ ,+++ kdm/," Patch75: kdm-make_it_cool.diff Patch76: kdm-admin-mode.diff Patch77: kdm-suspend-hal.diff @@ -191,6 +191,7 @@ Patch202: no-media-backend-hack.diff Patch203: show-konqueror-in-menu.diff Patch204: fix-desktop-icons.diff +Patch205: kcmkdm-default-grub.diff %description This package contains kdebase, one of the basic packages of the K @@ -377,7 +378,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 250 +Release: 252 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -550,6 +551,7 @@ %endif %patch203 %patch204 +%patch205 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -1562,6 +1564,12 @@ %endif %changelog +* Fri Mar 16 2007 - stbinner@suse.de +- update Kickoff from SVN: + * don't allow "Switch/Reboot to foo" items as Favorites + * distinct icons for suspend to ram and disk (#229966) +- fix "cannot login with KDM after wrong password" (#229245) +- fix kcmkdm not defaulting to Grub (#230715) * Fri Mar 09 2007 - stbinner@suse.de - fix build (new icon location check) - don't duplicate /opt/kde3/bin in PATH (#251358) ++++++ kcmkdm-default-grub.diff ++++++ --- kcontrol/kdm/kdm-shut.cpp (Revision 623677) +++ kcontrol/kdm/kdm-shut.cpp (Arbeitskopie) @@ -90,3 +90,3 @@ bm_combo = new KBackedComboBox( group4 ); - bm_combo->insertItem("None", i18n("boot manager", "None")); + bm_combo->insertItem("None", i18n("boot manager", "Grub")); bm_combo->insertItem("Grub", i18n("Grub")); ++++++ kdm-make_it_cool.diff ++++++ --- /var/tmp/diff_new_pack.eW1296/_old 2007-03-18 06:46:47.000000000 +0100 +++ /var/tmp/diff_new_pack.eW1296/_new 2007-03-18 06:46:47.000000000 +0100 @@ -741,7 +741,7 @@ } int px = area.left() + r.left(); -@@ -176,26 +209,34 @@ +@@ -176,26 +209,38 @@ if (pClass->readyPixmap.isNull()) { @@ -772,7 +772,11 @@ - } else + } else { + if (haveTint || haveAlpha) ++ { scaledImage = pClass->pixmap.convertToImage(); ++ // enforce rgba values for the later ++ scaledImage = scaledImage.convertDepth( 32 ); ++ } + else + pClass->readyPixmap = pClass->pixmap; + } @@ -783,7 +787,7 @@ if (haveTint || haveAlpha) { // blend image(pix) with the given tint -@@ -220,9 +261,12 @@ +@@ -220,9 +265,12 @@ } @@ -1478,19 +1482,21 @@ } else { if (userView) userView->hide(); -Index: kdmpixmap.cpp -=================================================================== ---- kdmpixmap.cpp (Revision 601201) -+++ kdm/kfrontend/themer/kdmpixmap.cpp (Arbeitskopie) -@@ -232,7 +232,11 @@ - } - } else { - if (haveTint || haveAlpha) -+ { - scaledImage = pClass->pixmap.convertToImage(); -+ // enforce rgba values for the later -+ scaledImage = scaledImage.convertDepth( 32 ); -+ } - else - pClass->readyPixmap = pClass->pixmap; - } +@@ -883,12 +1012,17 @@ + { + // goButton->setEnabled( false ); + inherited::verifyFailed(); ++ if (userView) ++ userView->setEnabled(false); + } + + void + KThemedGreeter::verifyRetry() + { + // goButton->setEnabled( true ); ++ if (userView) ++ userView->setEnabled(true); ++ + } + + QString KThemedGreeter::timedUser = QString::null; ++++++ kickoff-data.tar.bz2 ++++++ Files old/kicker/data/kickoff/cr128-action-suspend2disk.png and new/kicker/data/kickoff/cr128-action-suspend2disk.png differ Files old/kicker/data/kickoff/cr128-action-suspend2ram.png and new/kicker/data/kickoff/cr128-action-suspend2ram.png differ Files old/kicker/data/kickoff/cr16-action-suspend2disk.png and new/kicker/data/kickoff/cr16-action-suspend2disk.png differ Files old/kicker/data/kickoff/cr16-action-suspend2ram.png and new/kicker/data/kickoff/cr16-action-suspend2ram.png differ Files old/kicker/data/kickoff/cr32-action-suspend2disk.png and new/kicker/data/kickoff/cr32-action-suspend2disk.png differ Files old/kicker/data/kickoff/cr32-action-suspend2ram.png and new/kicker/data/kickoff/cr32-action-suspend2ram.png differ Files old/kicker/data/kickoff/cr48-action-suspend2disk.png and new/kicker/data/kickoff/cr48-action-suspend2disk.png differ Files old/kicker/data/kickoff/cr48-action-suspend2ram.png and new/kicker/data/kickoff/cr48-action-suspend2ram.png differ Files old/kicker/data/kickoff/cr64-action-suspend2disk.png and new/kicker/data/kickoff/cr64-action-suspend2disk.png differ Files old/kicker/data/kickoff/cr64-action-suspend2ram.png and new/kicker/data/kickoff/cr64-action-suspend2ram.png differ Files old/kicker/data/kickoff/crsc-action-suspend2disk.svgz and new/kicker/data/kickoff/crsc-action-suspend2disk.svgz differ Files old/kicker/data/kickoff/crsc-action-suspend2ram.svgz and new/kicker/data/kickoff/crsc-action-suspend2ram.svgz differ ++++++ kickoff.diff ++++++ --- /var/tmp/diff_new_pack.eW1296/_old 2007-03-18 06:46:48.000000000 +0100 +++ /var/tmp/diff_new_pack.eW1296/_new 2007-03-18 06:46:48.000000000 +0100 @@ -2855,7 +2855,7 @@ +} --- kicker/ui/k_new_mnu.cpp +++ kicker/ui/k_new_mnu.cpp -@@ -0,0 +1,3766 @@ +@@ -0,0 +1,3767 @@ +/***************************************************************** + + Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. @@ -3216,7 +3216,7 @@ + connect( input_timer, SIGNAL(timeout()), this, SLOT(doQuery()) ); + + init_search_timer = new QTimer (this, "init_search_timer"); -+ connect( input_timer, SIGNAL(timeout()), this, SLOT(initSearch()) ); ++ connect( init_search_timer, SIGNAL(timeout()), this, SLOT(initSearch()) ); + init_search_timer->start(2000, true); + + connect( m_favoriteView, SIGNAL( dropped (QDropEvent *, QListViewItem * ) ), @@ -5608,7 +5608,8 @@ + m_popupMenu->insertItem(SmallIconSet("remove"), + i18n("Remove From Favorites"), RemoveFromFavorites); + } -+ else if (!kitem->hasChildren() && !m_popupPath.path.startsWith("system:/")) ++ else if (!kitem->hasChildren() && !m_popupPath.path.startsWith("system:/") && ++ !m_popupPath.path.startsWith("kicker:/switchuser_") && !m_popupPath.path.startsWith("kicker:/restart_")) + { + hasEntries = true; + int num = m_popupMenu->insertItem(SmallIconSet("bookmark_add"), @@ -8641,7 +8642,7 @@ +#include "mykickoffsearchinterface.moc" --- kicker/ui/itemview.cpp +++ kicker/ui/itemview.cpp -@@ -0,0 +1,1256 @@ +@@ -0,0 +1,1257 @@ +/***************************************************************** + +Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. @@ -9684,7 +9685,8 @@ + path = locate("apps", path); + o->addDragObject(new KURLDrag(KURL::List(KURL(path)), 0)); + } -+ else if (kitem->path().startsWith("kicker:/new") || kitem->path().startsWith("system:/")) { ++ else if (kitem->path().startsWith("kicker:/new") || kitem->path().startsWith("system:/") ++ || kitem->path().startsWith("kicker:/switchuser_") || kitem->path().startsWith("kicker:/restart_")) { + delete o; + return 0; + } @@ -10706,7 +10708,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/search-gradient.png +Property changes on: data/kickoff/cr32-action-suspend2disk.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10714,7 +10716,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/main_corner_tr.png +Property changes on: data/kickoff/search-tab-left.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10722,7 +10724,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/cr48-app-recently_used.png +Property changes on: data/kickoff/main_corner_tr.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10730,7 +10732,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/search-tab-left.png +Property changes on: data/kickoff/cr48-app-recently_used.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10754,7 +10756,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/crsc-action-leave.svgz +Property changes on: data/kickoff/cr16-action-suspend2disk.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10762,7 +10764,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/kmenu_vertical.mng +Property changes on: data/kickoff/crsc-action-suspend2ram.svgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10770,7 +10772,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/resize_handle.png +Property changes on: data/kickoff/cr128-action-suspend2ram.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10778,7 +10780,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/kmenu_basic.mng +Property changes on: data/kickoff/cr32-action-leave.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10786,7 +10788,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/cr32-action-leave.png +Property changes on: data/kickoff/left_triangle.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10794,7 +10796,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/left_triangle.png +Property changes on: data/kickoff/menu_separator.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10802,7 +10804,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/kmenu_flipped.mng +Property changes on: data/kickoff/cr32-action-suspend2ram.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10810,7 +10812,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/search-running.mng +Property changes on: data/kickoff/cr48-action-leave.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10818,7 +10820,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/menu_separator.png +Property changes on: data/kickoff/cr16-action-suspend2ram.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10826,7 +10828,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/search-tab-right.png +Property changes on: data/kickoff/search-tab-top-center.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10834,7 +10836,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/search-tab-top-right.png +Property changes on: data/kickoff/search-tab-center.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10842,7 +10844,103 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/cr48-action-leave.png +Property changes on: data/kickoff/cr64-action-suspend2ram.png +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/cr48-action-suspend2ram.png +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/search-gradient.png +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/crsc-action-leave.svgz +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/kmenu_vertical.mng +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/cr64-action-suspend2disk.png +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/cr48-action-suspend2disk.png +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/resize_handle.png +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/kmenu_basic.mng +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/kmenu_flipped.mng +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/search-running.mng +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/search-tab-right.png +___________________________________________________________________ +Name: svn:mime-type + + application/octet-stream + +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: data/kickoff/search-tab-top-right.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10863,11 +10961,11 @@ +EXTRA_DIST = $(kicker_kmenuside_pics_data_DATA) + +kickerdir = $(kde_datadir)/kicker/icons -+kicker_ICON = leave recently_used ++kicker_ICON = leave recently_used suspend2disk suspend2ram Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/search-tab-center.png +Property changes on: data/kickoff/cr128-action-suspend2disk.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream @@ -10875,7 +10973,7 @@ Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream -Property changes on: data/kickoff/search-tab-top-center.png +Property changes on: data/kickoff/crsc-action-suspend2disk.svgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org