Hello community, here is the log from the commit of package kdeedu4 checked in at Sat Apr 26 11:31:29 CEST 2008. -------- --- KDE/kdeedu4/kdeedu4.changes 2008-04-21 16:17:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2008-04-25 17:24:31.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 17:24:24 CEST 2008 - dmueller@suse.de + +- branch diff update + +------------------------------------------------------------------- kdeedu4-noarch.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.Lg5175/_old 2008-04-26 11:31:15.000000000 +0200 +++ /var/tmp/diff_new_pack.Lg5175/_new 2008-04-26 11:31:15.000000000 +0200 @@ -21,7 +21,7 @@ Summary: General Data for KDE Education Applications Url: http://edu.kde.org Version: 4.0.3 -Release: 8 +Release: 10 Source0: kdeedu-%version.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -112,6 +112,8 @@ %doc COPYING COPYING-DOCS README %changelog +* Fri Apr 25 2008 dmueller@suse.de +- branch diff update * Mon Apr 21 2008 stbinner@suse.de - fix file lists - branch diff update ++++++ kdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.Lg5175/_old 2008-04-26 11:31:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Lg5175/_new 2008-04-26 11:31:16.000000000 +0200 @@ -25,7 +25,7 @@ Summary: General Data for KDE Education Applications Url: http://edu.kde.org Version: 4.0.3 -Release: 8 +Release: 10 %define rversion 4.0.3 Source0: kdeedu-%rversion.tar.bz2 Source1: _upstream @@ -652,6 +652,8 @@ %dir %_kde_share_dir/apps/libkdeedu %changelog +* Fri Apr 25 2008 dmueller@suse.de +- branch diff update * Mon Apr 21 2008 stbinner@suse.de - fix file lists - branch diff update ++++++ 4_0_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.Lg5175/_old 2008-04-26 11:31:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Lg5175/_new 2008-04-26 11:31:16.000000000 +0200 @@ -3,8 +3,52 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 796975 ++current HEAD: 801029 +svn di between //tags/KDE/4.0.3/kdeedu and //branches/KDE/4.0/kdeedu +--- libkdeedu/keduvocdocument/keduvockvtml2reader.cpp ++++ libkdeedu/keduvocdocument/keduvockvtml2reader.cpp +@@ -458,15 +458,14 @@ + } + + //<entry id="123"/> +- currentElement = lessonElement.firstChildElement( KVTML_ENTRY ); +- while ( !currentElement.isNull() ) { ++ QDomNodeList entries = lessonElement.elementsByTagName( KVTML_ENTRY ); ++ for (int i = 0; i < entries.count(); i++) { + bool result = false; +- int id = currentElement.attribute( KVTML_ID ).toInt( &result ); ++ int id = entries.item(i).toElement().attribute( KVTML_ID ).toInt( &result ); + if(result) { + m_doc->entry(id)->setLesson(lessonId); + m_doc->lesson(lessonId).addEntry(id); + } +- currentElement = currentElement.nextSiblingElement( KVTML_ENTRY ); + } + + ///@todo remove this after 4.0 release. it provides compability with some documents written with kvtml2 prior to the 4.0 release during the beta phase. +--- parley/src/main.cpp ++++ parley/src/main.cpp +@@ -101,7 +101,7 @@ + options.add(I18N_NOOP("+[file]"), ki18n("Document file to open")); + KCmdLineArgs::addCmdLineOptions(options); + KApplication app; +- ++ app.setQuitOnLastWindowClosed(false); + ParleyApp *parleyApp = 0; + if (app.isSessionRestored()) { + int n = 1; +--- parley/src/kvtlessonview.cpp ++++ parley/src/kvtlessonview.cpp +@@ -106,6 +106,9 @@ + void KVTLessonView::selectionChanged(const QItemSelection & selected, const QItemSelection & deselected) + { + QTreeView::selectionChanged(selected, deselected); ++ if (selected.isEmpty()) { ++ return; ++ } + slotSelectLesson(selected.indexes().at(0).row()); + } + Property changes on: . ___________________________________________________________________ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org