6 files changed, 50 insertions, 7 deletions

diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index 0ea8e06..0375fee 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -67,8 +67,11 @@ void GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(GSM_CalendarEntry *entr
                 case CAL_RECURRANCE:
                         if (*Recurrance == -1) *Recurrance = i;
                         break;
                 case CAL_TEXT:
+                    *Text = i;
+                        break;
+                case CAL_DESCRIPTION:
                         if (*Text == -1) *Text = i;
                         break;
                 case CAL_PHONE:
                         if (*Phone == -1) *Phone = i;
@@ -196,11 +199,11 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                         if (Text != -1)  {
                                 if (Phone != -1) EncodeUnicode(buffer+UnicodeLength(buffer)*2," ",1);
                                 CopyUnicodeString(buffer+UnicodeLength(buffer)*2,note->Entries[Text].Text);
                         }
-                        SaveVCALText(Buffer, Length, buffer, "DESCRIPTION");
+                        SaveVCALText(Buffer, Length, buffer, "SUMMARY");
                 } else {
-                        SaveVCALText(Buffer, Length, note->Entries[Text].Text, "DESCRIPTION");
+                        SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
                 }
         } else if (Version == SonyEricsson_VCalendar) {
                 *Length+=sprintf(Buffer+(*Length), "CATEGORIES:");
                 switch (note->Type) {
@@ -415,13 +418,19 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
                                 Calendar->Entries[Calendar->EntriesNum].Number    = 365*24;
                                 Calendar->EntriesNum++;
                         }
-                        if ((ReadVCALText(Line, "SUMMARY", Buff)) || (ReadVCALText(Line, "DESCRIPTION", Buff))) {
+            // LR 
+                        if ((ReadVCALText(Line, "SUMMARY", Buff)) ) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_TEXT;
                                 CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
                                 Calendar->EntriesNum++;
                         }
+                        if (ReadVCALText(Line, "DESCRIPTION", Buff)) {
+                                Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_DESCRIPTION;
+                                CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
+                                Calendar->EntriesNum++;
+                        }
                         if (ReadVCALText(Line, "LOCATION", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_LOCATION;
                                 CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
                                 Calendar->EntriesNum++;
diff --git a/gammu/emb/common/service/gsmcal.h b/gammu/emb/common/service/gsmcal.h
index 0a41b7b..c69fdbe 100644
--- a/gammu/emb/common/service/gsmcal.h
+++ b/gammu/emb/common/service/gsmcal.h
@@ -156,8 +156,9 @@ typedef enum {
         /**
          * Text.
          */
         CAL_TEXT,
+        CAL_DESCRIPTION, // LR added
         /**
          * Location.
          */
         CAL_LOCATION,
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 47ed858..dae9cd2 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -812,10 +812,11 @@ void KABCore::beamVCard(const QStringList& uids)
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
       QTextStream t( &outFile );  // use a text stream
-      t.setEncoding( QTextStream::UnicodeUTF8 );
-      t <<datastream;
+      //t.setEncoding( QTextStream::UnicodeUTF8 );
+      t.setEncoding( QTextStream::Latin1 );
+      t <<datastream.latin1();
       outFile.close();
       Ir *ir = new Ir( this );
       connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
       ir->send( fileName, description, "text/x-vCard" );
@@ -831,8 +832,9 @@ void KABCore::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
   delete ir;
 #endif
+  topLevelWidget()->raise();
 }
 
 
 void KABCore::browse( const QString& url )
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1f2c6da..3e0a27d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2322,8 +2322,14 @@ void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
             description.sprintf(i18n("  %d items?"),delSel.count() );
         }
         while ( incidence ) {
             Incidence *in = incidence->clone();
+            if ( ! in->summary().isEmpty() ) {
+                in->setDescription("");
+            } else {
+                in->setSummary( in->description().left(20));
+                in->setDescription("");
+            }
             if ( addText )
                 description += in->summary() + "\n";
             cal->addIncidence( in );
             incidence = delSel.next();
@@ -2338,10 +2344,10 @@ void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
             storage.save();
         }
         delete cal;
         mes = i18n("KO/Pi: Ready for beaming");
-        setCaption(mes); 
-        
+        topLevelWidget()->setCaption(mes); 
+        KApplication::convert2latin1( fn );
 #ifndef DESKTOP_VERSION
         Ir *ir = new Ir( this ); 
         connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
         ir->send( fn, description, "text/x-vCalendar" );
@@ -2352,8 +2358,10 @@ void  CalendarView::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
     delete ir;
 #endif
+    topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
+    topLevelWidget()->raise();
 }
 
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 98ef2f2..56c01af 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -63,8 +63,30 @@ void KApplication::showFile(QString caption, QString fn)
     KApplication::showText( caption, text );
   
 }
  
+bool KApplication::convert2latin1(QString fileName)
+{
+    QString text;
+    QFile file( fileName );
+    if (!file.open( IO_ReadOnly ) ) {
+        return false;
+        
+    } 
+    QTextStream ts( &file );
+    ts.setEncoding( QTextStream::UnicodeUTF8 );
+    text = ts.read();
+    file.close();  
+    if (!file.open( IO_WriteOnly ) ) {
+        return false;
+    }
+    QTextStream tsIn( &file );
+    tsIn.setEncoding( QTextStream::Latin1 );
+    tsIn << text.latin1();
+    file.close();  
+ 
+
+}
 void KApplication::showText(QString caption, QString text)
 {
     QDialog dia( 0, "name", true ); ;
     dia.setCaption( caption );
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 79cdb33..41546a0 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -19,8 +19,9 @@ class KApplication
   static int execDialog( QDialog* ); 
   static void showLicence(); 
   static void showFile(QString caption, QString file); 
   static void showText(QString caption, QString text); 
+  static bool convert2latin1(QString file); 
 };
 
 
 #endif