-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/usermanager/userdialog.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index ee01b61..90e44cb 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -151,25 +151,25 @@ void BlueBase::writeConfig() | |||
151 | 151 | ||
152 | writeToHciConfig(); | 152 | writeToHciConfig(); |
153 | } | 153 | } |
154 | 154 | ||
155 | /** | 155 | /** |
156 | * Modify the hcid.conf file to our needs | 156 | * Modify the hcid.conf file to our needs |
157 | */ | 157 | */ |
158 | void BlueBase::writeToHciConfig() | 158 | void BlueBase::writeToHciConfig() |
159 | { | 159 | { |
160 | owarn << "writeToHciConfig" << oendl; | 160 | owarn << "writeToHciConfig" << oendl; |
161 | HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); | 161 | HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); |
162 | hciconf.load(); | 162 | hciconf.load(); |
163 | hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); | 163 | hciconf.setPinHelper( QPEApplication::qpeDir() + "bin/bluepin" ); |
164 | hciconf.setName( m_deviceName ); | 164 | hciconf.setName( m_deviceName ); |
165 | hciconf.setEncrypt( m_useEncryption ); | 165 | hciconf.setEncrypt( m_useEncryption ); |
166 | hciconf.setAuth( m_enableAuthentification ); | 166 | hciconf.setAuth( m_enableAuthentification ); |
167 | hciconf.setPscan( m_enablePagescan ); | 167 | hciconf.setPscan( m_enablePagescan ); |
168 | hciconf.setIscan( m_enableInquiryscan ); | 168 | hciconf.setIscan( m_enableInquiryscan ); |
169 | hciconf.save(); | 169 | hciconf.save(); |
170 | } | 170 | } |
171 | 171 | ||
172 | 172 | ||
173 | /** | 173 | /** |
174 | * Read the list of allready known devices | 174 | * Read the list of allready known devices |
175 | */ | 175 | */ |
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp index 3616507..9dfb2af 100644 --- a/noncore/settings/usermanager/userdialog.cpp +++ b/noncore/settings/usermanager/userdialog.cpp | |||
@@ -256,29 +256,29 @@ bool UserDialog::addUser(int uid, int gid) | |||
256 | // Add User to additional groups. | 256 | // Add User to additional groups. |
257 | QListViewItemIterator it( adduserDialog->groupsListView ); | 257 | QListViewItemIterator it( adduserDialog->groupsListView ); |
258 | for ( ; it.current(); ++it ) | 258 | for ( ; it.current(); ++it ) |
259 | { | 259 | { |
260 | temp=(QCheckListItem*)it.current(); | 260 | temp=(QCheckListItem*)it.current(); |
261 | if (temp->isOn() ) | 261 | if (temp->isOn() ) |
262 | accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text()); | 262 | accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text()); |
263 | } | 263 | } |
264 | // Copy image to pics/users/ | 264 | // Copy image to pics/users/ |
265 | if(!(adduserDialog->userImage.isNull())) | 265 | if(!(adduserDialog->userImage.isNull())) |
266 | { | 266 | { |
267 | QDir d; | 267 | QDir d; |
268 | if(!(d.exists("/opt/QtPalmtop/pics/users"))) | 268 | if(!(d.exists(QPEApplication::qpeDir() + "pics/users"))) |
269 | { | 269 | { |
270 | d.mkdir("/opt/QtPalmtop/pics/users"); | 270 | d.mkdir(QPEApplication::qpeDir() + "pics/users"); |
271 | } | 271 | } |
272 | QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"; | 272 | QString filename= QPEApplication::qpeDir()+"pics/users/"+accounts->pw_name+".png"; |
273 | // adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48); | 273 | // adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48); |
274 | adduserDialog->userImage.save(filename,"PNG"); | 274 | adduserDialog->userImage.save(filename,"PNG"); |
275 | } | 275 | } |
276 | 276 | ||
277 | // Should we copy the skeleton homedirectory /etc/skel to the user's homedirectory? | 277 | // Should we copy the skeleton homedirectory /etc/skel to the user's homedirectory? |
278 | accounts->findUser(adduserDialog->loginLineEdit->text()); | 278 | accounts->findUser(adduserDialog->loginLineEdit->text()); |
279 | if(adduserDialog->skelCheckBox->isChecked()) | 279 | if(adduserDialog->skelCheckBox->isChecked()) |
280 | { | 280 | { |
281 | QString command_cp; | 281 | QString command_cp; |
282 | QString command_chown; | 282 | QString command_chown; |
283 | command_cp.sprintf("cp -a /etc/skel/* %s/",accounts->pw_dir.latin1()); | 283 | command_cp.sprintf("cp -a /etc/skel/* %s/",accounts->pw_dir.latin1()); |
284 | system(command_cp); | 284 | system(command_cp); |
@@ -427,29 +427,29 @@ bool UserDialog::editUser(const char *username) | |||
427 | QListViewItemIterator it( edituserDialog->groupsListView ); | 427 | QListViewItemIterator it( edituserDialog->groupsListView ); |
428 | for ( ; it.current(); ++it ) | 428 | for ( ; it.current(); ++it ) |
429 | { | 429 | { |
430 | temp=(QCheckListItem*)it.current(); | 430 | temp=(QCheckListItem*)it.current(); |
431 | if ( temp->isOn() ) | 431 | if ( temp->isOn() ) |
432 | accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text()); | 432 | accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text()); |
433 | } | 433 | } |
434 | 434 | ||
435 | // Copy image to pics/users/ | 435 | // Copy image to pics/users/ |
436 | if(!(edituserDialog->userImage.isNull())) | 436 | if(!(edituserDialog->userImage.isNull())) |
437 | { | 437 | { |
438 | QDir d; | 438 | QDir d; |
439 | if(!(d.exists("/opt/QtPalmtop/pics/users"))) | 439 | if(!(d.exists(QPEApplication::qpeDir()+"pics/users"))) |
440 | { | 440 | { |
441 | d.mkdir("/opt/QtPalmtop/pics/users"); | 441 | d.mkdir(QPEApplication::qpeDir()+"pics/users"); |
442 | } | 442 | } |
443 | QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"; | 443 | QString filename=QPEApplication::qpeDir()+"pics/users/"+accounts->pw_name+".png"; |
444 | // edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48); | 444 | // edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48); |
445 | edituserDialog->userImage.save(filename,"PNG"); | 445 | edituserDialog->userImage.save(filename,"PNG"); |
446 | } | 446 | } |
447 | return true; | 447 | return true; |
448 | } | 448 | } |
449 | 449 | ||
450 | /** | 450 | /** |
451 | * "OK" has been clicked. Verify some information before closing the dialog. | 451 | * "OK" has been clicked. Verify some information before closing the dialog. |
452 | * | 452 | * |
453 | */ | 453 | */ |
454 | void UserDialog::accept() | 454 | void UserDialog::accept() |
455 | { | 455 | { |