-rw-r--r-- | kabc/stdaddressbook.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index ec47a4e..181a09e 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -136,65 +136,70 @@ void StdAddressBook::init( bool ) | |||
136 | 136 | ||
137 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 137 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |
138 | (*it)->setAddressBook( this ); | 138 | (*it)->setAddressBook( this ); |
139 | if ( !(*it)->open() ) | 139 | if ( !(*it)->open() ) |
140 | error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); | 140 | error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); |
141 | } | 141 | } |
142 | 142 | ||
143 | Resource *res = standardResource(); | 143 | Resource *res = standardResource(); |
144 | if ( !res ) { | 144 | if ( !res ) { |
145 | res = manager->createResource( "file" ); | 145 | res = manager->createResource( "file" ); |
146 | if ( res ) | 146 | if ( res ) |
147 | { | 147 | { |
148 | addResource( res ); | 148 | addResource( res ); |
149 | } | 149 | } |
150 | else | 150 | else |
151 | qDebug(" No resource available!!!"); | 151 | qDebug(" No resource available!!!"); |
152 | } | 152 | } |
153 | 153 | ||
154 | setStandardResource( res ); | 154 | setStandardResource( res ); |
155 | manager->writeConfig(); | 155 | manager->writeConfig(); |
156 | 156 | ||
157 | load(); | 157 | load(); |
158 | } | 158 | } |
159 | 159 | ||
160 | bool StdAddressBook::save() | 160 | bool StdAddressBook::save() |
161 | { | 161 | { |
162 | kdDebug(5700) << "StdAddressBook::save()" << endl; | 162 | kdDebug(5700) << "StdAddressBook::save()" << endl; |
163 | 163 | ||
164 | bool ok = true; | 164 | bool ok = true; |
165 | AddressBook *ab = self(); | 165 | AddressBook *ab = self(); |
166 | 166 | ||
167 | ab->deleteRemovedAddressees(); | 167 | ab->deleteRemovedAddressees(); |
168 | 168 | Iterator ait; | |
169 | for ( ait = ab->begin(); ait != ab->end(); ++ait ) { | ||
170 | if ( !(*ait).IDStr().isEmpty() ) { | ||
171 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); | ||
172 | } | ||
173 | } | ||
169 | KRES::Manager<Resource>::ActiveIterator it; | 174 | KRES::Manager<Resource>::ActiveIterator it; |
170 | KRES::Manager<Resource> *manager = ab->resourceManager(); | 175 | KRES::Manager<Resource> *manager = ab->resourceManager(); |
171 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 176 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |
172 | if ( !(*it)->readOnly() && (*it)->isOpen() ) { | 177 | if ( !(*it)->readOnly() && (*it)->isOpen() ) { |
173 | Ticket *ticket = ab->requestSaveTicket( *it ); | 178 | Ticket *ticket = ab->requestSaveTicket( *it ); |
174 | // qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() ); | 179 | // qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() ); |
175 | if ( !ticket ) { | 180 | if ( !ticket ) { |
176 | ab->error( i18n( "Unable to save to resource '%1'. It is locked." ) | 181 | ab->error( i18n( "Unable to save to resource '%1'. It is locked." ) |
177 | .arg( (*it)->resourceName() ) ); | 182 | .arg( (*it)->resourceName() ) ); |
178 | return false; | 183 | return false; |
179 | } | 184 | } |
180 | 185 | ||
181 | if ( !ab->save( ticket ) ) | 186 | if ( !ab->save( ticket ) ) |
182 | ok = false; | 187 | ok = false; |
183 | } | 188 | } |
184 | } | 189 | } |
185 | 190 | ||
186 | return ok; | 191 | return ok; |
187 | } | 192 | } |
188 | 193 | ||
189 | void StdAddressBook::close() | 194 | void StdAddressBook::close() |
190 | { | 195 | { |
191 | //US destructObject is not defined on my system???. Is setObject(0) the same ??? | 196 | //US destructObject is not defined on my system???. Is setObject(0) the same ??? |
192 | //US addressBookDeleter.destructObject(); | 197 | //US addressBookDeleter.destructObject(); |
193 | addressBookDeleter.setObject(0); | 198 | addressBookDeleter.setObject(0); |
194 | 199 | ||
195 | } | 200 | } |
196 | 201 | ||
197 | void StdAddressBook::setAutomaticSave( bool enable ) | 202 | void StdAddressBook::setAutomaticSave( bool enable ) |
198 | { | 203 | { |
199 | mAutomaticSave = enable; | 204 | mAutomaticSave = enable; |
200 | } | 205 | } |