Author: glen Date: Thu Apr 23 14:29:40 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdenetwork-branch.diff (1.44 -> 1.45) , kdeutils-branch.diff (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/kdenetwork-branch.diff
diff -u /dev/null SOURCES/kdenetwork-branch.diff:1.45
--- /dev/null Thu Apr 23 16:29:40 2009
+++ SOURCES/kdenetwork-branch.diff Thu Apr 23 16:29:34 2009
@@ -0,0 +1,57 @@
+Index: kopete/protocols/groupwise/gwaccount.cpp
+===================================================================
+--- kopete/protocols/groupwise/gwaccount.cpp
(.../tags/KDE/3.5.10/kdenetwork) (revision 958220)
++++ kopete/protocols/groupwise/gwaccount.cpp
(.../branches/KDE/3.5/kdenetwork) (revision 958220)
+@@ -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
+Index: kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
+===================================================================
+--- kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
(.../tags/KDE/3.5.10/kdenetwork) (revision 958220)
++++ kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp
(.../branches/KDE/3.5/kdenetwork) (revision 958220)
+@@ -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() )
+
+Property changes on: .
+___________________________________________________________________
+Deleted: svn:mergeinfo
+Added: svn:externals
+ + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
+
+
================================================================
Index: SOURCES/kdeutils-branch.diff
diff -u /dev/null SOURCES/kdeutils-branch.diff:1.7
--- /dev/null Thu Apr 23 16:29:41 2009
+++ SOURCES/kdeutils-branch.diff Thu Apr 23 16:29:34 2009
@@ -0,0 +1,45 @@
+Index: kcalc/kcalcdisplay.cpp
+===================================================================
+--- kcalc/kcalcdisplay.cpp (.../tags/KDE/3.5.10/kdeutils) (revision
958220)
++++ kcalc/kcalcdisplay.cpp (.../branches/KDE/3.5/kdeutils) (revision
958220)
+@@ -102,11 +102,7 @@
+
+ void KCalcDisplay::slotCopy(void)
+ {
+- QString txt;
+- if (_num_base != NB_DECIMAL)
+- txt = QLabel::text();
+- else
+- txt = _display_amount.toQString();
++ QString txt = QLabel::text();
+ if (_num_base == NB_HEX)
+ txt.prepend( "0x" );
+ (QApplication::clipboard())->setText(txt, QClipboard::Clipboard);
+Index: ark/arkwidget.cpp
+===================================================================
+--- ark/arkwidget.cpp (.../tags/KDE/3.5.10/kdeutils) (revision 958220)
++++ ark/arkwidget.cpp (.../branches/KDE/3.5/kdeutils) (revision 958220)
+@@ -566,11 +566,15 @@
+
+ // TODO: remote Archives should be handled by createArchive
+ if ( archive.isLocalFile() )
++ {
+ if ( !createArchive( archive.path() ) )
+ return false;
++ }
+ else
++ {
+ if ( !createArchive( tmpDir() + archive.fileName() ) )
+ return false;
++ }
+ return true;
+
+ }
+
+Property changes on: .
+___________________________________________________________________
+Deleted: svn:mergeinfo
+Added: svn:externals
+ + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
+
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdenetwork-branch.diff?r1=1.44&r2=1.45&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdeutils-branch.diff?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
