equal
deleted
inserted
replaced
569 for (int i = 0; i < destinationList.count(); i ++) { |
569 for (int i = 0; i < destinationList.count(); i ++) { |
570 CmDestinationShim *dest = cmm->destination(destinationList[i]); |
570 CmDestinationShim *dest = cmm->destination(destinationList[i]); |
571 if (0 == destination.compare(dest->name())) { |
571 if (0 == destination.compare(dest->name())) { |
572 destination = hbTrId("txt_occ_info_name_already_in_use"); |
572 destination = hbTrId("txt_occ_info_name_already_in_use"); |
573 retVal = false; |
573 retVal = false; |
|
574 delete dest; |
574 break; |
575 break; |
575 } |
576 } |
576 delete dest; |
577 delete dest; |
577 } |
578 } |
578 } else { |
579 } else { |
690 CmDestinationShim *destination = NULL; |
691 CmDestinationShim *destination = NULL; |
691 |
692 |
692 try { |
693 try { |
693 cmm = new CmManagerShim(); |
694 cmm = new CmManagerShim(); |
694 if (isDestinationNameValid(destinationName, cmm)) { |
695 if (isDestinationNameValid(destinationName, cmm)) { |
695 cmm = new CmManagerShim(); |
|
696 destination = cmm->destination(mDestinationId); |
696 destination = cmm->destination(mDestinationId); |
697 destination->setName(destinationName); |
697 destination->setName(destinationName); |
698 destination->update(); |
698 destination->update(); |
699 mDestinationName = destinationName; |
699 mDestinationName = destinationName; |
700 destinationNameInvalid = false; |
700 destinationNameInvalid = false; |