Hello community, here is the log from the commit of package kdenetwork3 checked in at Mon Sep 29 17:51:29 CEST 2008. -------- --- KDE/kdenetwork3/kdenetwork3.changes 2008-08-26 11:46:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdenetwork3/kdenetwork3.changes 2008-09-27 11:12:23.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 27 11:07:39 CEST 2008 - wstephenson@suse.de + +- Update branch diff: + * Fix crash on getting user details in Groupwise (bnc#354159) + * Fix crash on exit bug in GroupWise (bnc#336059) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork3.spec ++++++ --- /var/tmp/diff_new_pack.m12923/_old 2008-09-29 17:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.m12923/_new 2008-09-29 17:51:12.000000000 +0200 @@ -31,7 +31,7 @@ Summary: KDE Network Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.5.10 -Release: 2 +Release: 11 Provides: kdenetwork3-lan:/opt/kde3/bin/kpf Source0: kdenetwork-%{version}.tar.bz2 Source1: init.lisa @@ -669,6 +669,10 @@ /opt/kde3/%_lib/libkopete_videodevice.so %changelog +* Sat Sep 27 2008 wstephenson@suse.de +- Update branch diff: + * Fix crash on getting user details in Groupwise (bnc#354159) + * Fix crash on exit bug in GroupWise (bnc#336059) * Tue Aug 26 2008 stbinner@suse.de - fix build again * Wed Aug 20 2008 coolo@suse.de ++++++ 3_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.m12923/_old 2008-09-29 17:51:12.000000000 +0200 +++ /var/tmp/diff_new_pack.m12923/_new 2008-09-29 17:51:12.000000000 +0200 @@ -3,13 +3,58 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: ++current HEAD: 865247 +svn di between //tags/KDE/3.5.10/kdenetwork and //branches/KDE/3.5/kdenetwork +--- kopete/protocols/groupwise/gwaccount.cpp ++++ kopete/protocols/groupwise/gwaccount.cpp +@@ -294,7 +294,7 @@ + // not implemented: error + QObject::connect( m_clientStream, SIGNAL( error(int) ), SLOT( slotCSError(int) ) ); + +- m_client = new Client( this, CMSGPRES_GW_6_5 ); ++ m_client = new Client( 0, CMSGPRES_GW_6_5 ); + + // NB these are prefixed with QObject:: to avoid any chance of a clash with our connect() methods. + // we connected successfully +--- kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp ++++ kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp +@@ -104,10 +104,27 @@ + const Field::FieldListIterator end = fl.end(); + for ( Field::FieldListIterator it = fl.begin(); it != end; ++it ) + { +- Field::SingleField * propField = static_cast<Field::SingleField *>( *it ); +- QString propName = propField->tag(); +- QString propValue = propField->value().toString(); +- propMap.insert( propName, propValue ); ++ Field::SingleField * propField = dynamic_cast<Field::SingleField *>( *it ); ++ if ( propField ) { ++ QString propName = propField->tag(); ++ QString propValue = propField->value().toString(); ++ propMap.insert( propName, propValue ); ++ } else { ++ Field::MultiField * mf2; ++ if ( ( mf2 = dynamic_cast<Field::MultiField *>( *it ) ) ) { ++ Field::FieldList fl2 = mf2->fields(); ++ const Field::FieldListIterator end = fl2.end(); ++ for ( Field::FieldListIterator it2 = fl2.begin(); it2 != end; ++it2 ) ++ { ++ propField = dynamic_cast<Field::SingleField *>( *it2 ); ++ if ( propField ) { ++ QString propName = propField->tag(); ++ QString propValue = propField->value().toString(); ++ propMap.insert( propName, propValue ); ++ } ++ } ++ } ++ } + } + } + if ( !propMap.empty() ) -Eigenschaftsänderungen: . +Property changes on: . ___________________________________________________________________ -Gelöscht: svn:mergeinfo -Hinzugefügt: svn:externals +Deleted: svn:mergeinfo +Added: svn:externals + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org