From be3a5ea82c9a160eeeaad187a357c9a085fdb20a Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 06 Oct 2004 19:41:10 +0000
Subject: bugfixes

---
diff --git a/gammu/emb/common/gsmstate.h b/gammu/emb/common/gsmstate.h
index 2b4806c..f15a6a7 100644
--- a/gammu/emb/common/gsmstate.h
+++ b/gammu/emb/common/gsmstate.h
@@ -161,7 +161,6 @@ typedef struct _GSM_Reply_Function	GSM_Reply_Function;
 #  undef GSM_ENABLE_FBUS2BLUE
 #  undef GSM_ENABLE_MROUTERBLUE
 #endif
-
 #ifndef WIN32
 #  ifdef ENABLE_LGPL
 #    undef GSM_ENABLE_IRDADEVICE
@@ -1577,3 +1576,4 @@ void GSM_GetPhoneFeaturesForBackup(GSM_StateMachine *s, GSM_Backup_Info *info);
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
+
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7bec90a..b014cba 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -35,6 +35,7 @@ $Id$
 #include <kfiledialog.h>
 #include <qtimer.h>
 #include <qlabel.h>
+#include <qregexp.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
@@ -726,6 +727,11 @@ void KABCore::export2phone()
       t.setEncoding( QTextStream::UnicodeUTF8 );
       t <<datastream;
       outFile.close();
+      if ( PhoneAccess::writeToPhone( fileName ) )
+          qDebug("Export okay ");
+      else
+          qDebug("Error export contacts ");
+          
   } else {
       qDebug("Error open temp file ");
       return;
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index c0bd6cc..357cd39 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -40,7 +40,7 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
     QString fileName = QDir::homeDirPath() +"/.gammurc";
 #endif
     //qDebug("save %d ", load );
-    QString content;
+    QString content = "[gammu]\n";;
     bool write = false;
     bool addPort = true, addConnection = true, addModel = true;
     QFile file( fileName );
@@ -53,7 +53,7 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
         while ( file.readLine( line, 1024 ) > 0 ) {
             //qDebug("*%s* ", line.latin1() );
             if ( line.left(7 ) == "[gammu]" ) {
-                ;
+               ; 
             } else 
             if ( line.left(4 ) == "port" ) {
                 if ( line == "port = " + device+"\n" ) {
@@ -93,18 +93,14 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
             addModel = true; 
         }
     }
-
+   
     if ( addConnection ) {
-        if ( ! write ) 
-            content += "[gammu]\n";
         write = true;
         content += "connection = ";
         content += connection;
         content += "\n";
     }
     if ( addPort ) {
-        if ( ! write ) 
-            content += "[gammu]\n";
         write = true;
         content += "port = ";
         content += device;
@@ -112,8 +108,6 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
 
     }
     if ( addModel ) {
-        if ( ! write ) 
-            content += "[gammu]\n";
         write = true;
         content += "model = ";
         content += model;
--
cgit v0.9.0.2