Patch from Brad Campbell to fix opie-handwritings writing of data files

3 files changed, 10 insertions, 6 deletions

diff --git a/inputmethods/handwriting/qimpenchar.cpp b/inputmethods/handwriting/qimpenchar.cpp
index 152bfec..0c37e5c 100644
--- a/inputmethods/handwriting/qimpenchar.cpp
+++ b/inputmethods/handwriting/qimpenchar.cpp
@@ -361,27 +361,30 @@ bool QIMPenCharSet::save( Domain d )
     bool ok = FALSE;
 
     QString fn = filename( d );
     QString tmpFn = fn + ".new";
     QFile file( tmpFn );
     if ( file.open( IO_WriteOnly|IO_Raw ) ) {
-        QDataStream ds( &file );
+        QByteArray buf;
+        QDataStream ds( buf, IO_WriteOnly );
         ds << QString( "QPT 1.1" );
         ds << csTitle;
         ds << desc;
         ds << (Q_INT8)csType;
         QIMPenCharIterator ci( chars );
         for ( ; ci.current(); ++ci ) {
             QIMPenChar *pc = ci.current();
-            if ( ( (d == System) && pc->testFlag( QIMPenChar::System ) ) ||
-                 ( (d == User) && !pc->testFlag( QIMPenChar::System ) ) ) {
+            if ( ( ( (d == System) && pc->testFlag( QIMPenChar::System ) ) ||
+                 ( (d == User) && !pc->testFlag( QIMPenChar::System ) ) ) &&
+                 ( !pc->testFlag (QIMPenChar::Combined ) ) ) {
                 ds << *pc;
             }
-            if ( file.status() != IO_Ok )
-                break;
         }
+
+                file.writeBlock( buf );
+                file.close();
         if ( file.status() == IO_Ok )
             ok = TRUE;
     }
 
     if ( ok ) {
         if ( ::rename( tmpFn.latin1(), fn.latin1() ) < 0 ) {
diff --git a/inputmethods/handwriting/qimpenchar.h b/inputmethods/handwriting/qimpenchar.h
index 9a5f687..efd6f16 100644
--- a/inputmethods/handwriting/qimpenchar.h
+++ b/inputmethods/handwriting/qimpenchar.h
@@ -57,13 +57,13 @@ public:
     QRect boundingRect();
 
     void setFlag( int f ) { flags |= f; }
     void clearFlag( int f ) { flags &= ~f; }
     bool testFlag( int f ) { return flags & f; }
 
-    enum Flags { System=0x01, Deleted=0x02, CombineRight=0x04, Data=0x08 };
+    enum Flags { System=0x01, Deleted=0x02, CombineRight=0x04, Data=0x08, Combined=0x10 };
     // Correspond to codes in template files.  Do not change values.
     enum Mode { ModeBase=0x4000, Caps=0x4001, Shortcut=0x4002, CapsLock=0x4003,
                  Punctuation=0x4004, Symbol=0x4005, Extended=0x4006 };
 
     QIMPenChar &operator=( const QIMPenChar &s );
 
diff --git a/inputmethods/handwriting/qimpencombining.cpp b/inputmethods/handwriting/qimpencombining.cpp
index 30459e7..2e01ac2 100644
--- a/inputmethods/handwriting/qimpencombining.cpp
+++ b/inputmethods/handwriting/qimpencombining.cpp
@@ -69,12 +69,13 @@ void QIMPenCombining::addCombined( QIMPenCharSet *cs )
                 QIMPenCharIterator cit( chars );
                 for ( ; cit.current(); ++cit ) {
                     QIMPenChar *accentPc = cit.current();
                     if ( accentPc->character() == combiningSymbols[i] ) {
                         QIMPenChar *combined = combine( pc, accentPc );
                         combined->setCharacter( combiningChars[charIdx][i+1] );
+                        combined->setFlag( QIMPenChar::Combined );
                         cs->addChar( combined );
                     }
                 }
             }
         }
     }