summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-06 19:41:10 (UTC)
committer zautrix <zautrix>2004-10-06 19:41:10 (UTC)
commitbe3a5ea82c9a160eeeaad187a357c9a085fdb20a (patch) (side-by-side diff)
tree933c685c84430f5c19a0657239b5c8b50a88de05
parent656636acfb8c607901c97c4f55129e29e1df9913 (diff)
downloadkdepimpi-be3a5ea82c9a160eeeaad187a357c9a085fdb20a.zip
kdepimpi-be3a5ea82c9a160eeeaad187a357c9a085fdb20a.tar.gz
kdepimpi-be3a5ea82c9a160eeeaad187a357c9a085fdb20a.tar.bz2
bugfixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--gammu/emb/common/gsmstate.h2
-rw-r--r--kaddressbook/kabcore.cpp6
-rw-r--r--libkdepim/phoneaccess.cpp12
3 files changed, 10 insertions, 10 deletions
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
@@ -163,3 +163,2 @@ typedef struct _GSM_Reply_Function GSM_Reply_Function;
#endif
-
#ifndef WIN32
@@ -1579 +1578,2 @@ void GSM_GetPhoneFeaturesForBackup(GSM_StateMachine *s, GSM_Backup_Info *info);
*/
+
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7bec90a..b014cba 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -37,2 +37,3 @@ $Id$
#include <qlabel.h>
+#include <qregexp.h>
#include <qlineedit.h>
@@ -728,2 +729,7 @@ void KABCore::export2phone()
outFile.close();
+ if ( PhoneAccess::writeToPhone( fileName ) )
+ qDebug("Export okay ");
+ else
+ qDebug("Error export contacts ");
+
} else {
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index c0bd6cc..357cd39 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -42,3 +42,3 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
//qDebug("save %d ", load );
- QString content;
+ QString content = "[gammu]\n";;
bool write = false;
@@ -55,3 +55,3 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
if ( line.left(7 ) == "[gammu]" ) {
- ;
+ ;
} else
@@ -95,6 +95,4 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
}
-
+
if ( addConnection ) {
- if ( ! write )
- content += "[gammu]\n";
write = true;
@@ -105,4 +103,2 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
if ( addPort ) {
- if ( ! write )
- content += "[gammu]\n";
write = true;
@@ -114,4 +110,2 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
if ( addModel ) {
- if ( ! write )
- content += "[gammu]\n";
write = true;