-rw-r--r-- | gammu/emb/common/gsmstate.h | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 | ||||
-rw-r--r-- | libkdepim/phoneaccess.cpp | 12 |
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 | |||
@@ -161,7 +161,6 @@ typedef struct _GSM_Reply_Function GSM_Reply_Function; | |||
161 | # undef GSM_ENABLE_FBUS2BLUE | 161 | # undef GSM_ENABLE_FBUS2BLUE |
162 | # undef GSM_ENABLE_MROUTERBLUE | 162 | # undef GSM_ENABLE_MROUTERBLUE |
163 | #endif | 163 | #endif |
164 | |||
165 | #ifndef WIN32 | 164 | #ifndef WIN32 |
166 | # ifdef ENABLE_LGPL | 165 | # ifdef ENABLE_LGPL |
167 | # undef GSM_ENABLE_IRDADEVICE | 166 | # undef GSM_ENABLE_IRDADEVICE |
@@ -1577,3 +1576,4 @@ void GSM_GetPhoneFeaturesForBackup(GSM_StateMachine *s, GSM_Backup_Info *info); | |||
1577 | /* How should editor hadle tabs in this file? Add editor commands here. | 1576 | /* How should editor hadle tabs in this file? Add editor commands here. |
1578 | * vim: noexpandtab sw=8 ts=8 sts=8: | 1577 | * vim: noexpandtab sw=8 ts=8 sts=8: |
1579 | */ | 1578 | */ |
1579 | |||
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$ | |||
35 | #include <kfiledialog.h> | 35 | #include <kfiledialog.h> |
36 | #include <qtimer.h> | 36 | #include <qtimer.h> |
37 | #include <qlabel.h> | 37 | #include <qlabel.h> |
38 | #include <qregexp.h> | ||
38 | #include <qlineedit.h> | 39 | #include <qlineedit.h> |
39 | #include <qcheckbox.h> | 40 | #include <qcheckbox.h> |
40 | #include <qpushbutton.h> | 41 | #include <qpushbutton.h> |
@@ -726,6 +727,11 @@ void KABCore::export2phone() | |||
726 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 727 | t.setEncoding( QTextStream::UnicodeUTF8 ); |
727 | t <<datastream; | 728 | t <<datastream; |
728 | outFile.close(); | 729 | outFile.close(); |
730 | if ( PhoneAccess::writeToPhone( fileName ) ) | ||
731 | qDebug("Export okay "); | ||
732 | else | ||
733 | qDebug("Error export contacts "); | ||
734 | |||
729 | } else { | 735 | } else { |
730 | qDebug("Error open temp file "); | 736 | qDebug("Error open temp file "); |
731 | return; | 737 | 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 | |||
40 | QString fileName = QDir::homeDirPath() +"/.gammurc"; | 40 | QString fileName = QDir::homeDirPath() +"/.gammurc"; |
41 | #endif | 41 | #endif |
42 | //qDebug("save %d ", load ); | 42 | //qDebug("save %d ", load ); |
43 | QString content; | 43 | QString content = "[gammu]\n";; |
44 | bool write = false; | 44 | bool write = false; |
45 | bool addPort = true, addConnection = true, addModel = true; | 45 | bool addPort = true, addConnection = true, addModel = true; |
46 | QFile file( fileName ); | 46 | QFile file( fileName ); |
@@ -53,7 +53,7 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model | |||
53 | while ( file.readLine( line, 1024 ) > 0 ) { | 53 | while ( file.readLine( line, 1024 ) > 0 ) { |
54 | //qDebug("*%s* ", line.latin1() ); | 54 | //qDebug("*%s* ", line.latin1() ); |
55 | if ( line.left(7 ) == "[gammu]" ) { | 55 | if ( line.left(7 ) == "[gammu]" ) { |
56 | ; | 56 | ; |
57 | } else | 57 | } else |
58 | if ( line.left(4 ) == "port" ) { | 58 | if ( line.left(4 ) == "port" ) { |
59 | if ( line == "port = " + device+"\n" ) { | 59 | if ( line == "port = " + device+"\n" ) { |
@@ -93,18 +93,14 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model | |||
93 | addModel = true; | 93 | addModel = true; |
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
97 | if ( addConnection ) { | 97 | if ( addConnection ) { |
98 | if ( ! write ) | ||
99 | content += "[gammu]\n"; | ||
100 | write = true; | 98 | write = true; |
101 | content += "connection = "; | 99 | content += "connection = "; |
102 | content += connection; | 100 | content += connection; |
103 | content += "\n"; | 101 | content += "\n"; |
104 | } | 102 | } |
105 | if ( addPort ) { | 103 | if ( addPort ) { |
106 | if ( ! write ) | ||
107 | content += "[gammu]\n"; | ||
108 | write = true; | 104 | write = true; |
109 | content += "port = "; | 105 | content += "port = "; |
110 | content += device; | 106 | content += device; |
@@ -112,8 +108,6 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model | |||
112 | 108 | ||
113 | } | 109 | } |
114 | if ( addModel ) { | 110 | if ( addModel ) { |
115 | if ( ! write ) | ||
116 | content += "[gammu]\n"; | ||
117 | write = true; | 111 | write = true; |
118 | content += "model = "; | 112 | content += "model = "; |
119 | content += model; | 113 | content += model; |