1 files changed, 1 insertions, 5 deletions

diff --git a/noncore/unsupported/gsmtool/gsmtool.cpp b/noncore/unsupported/gsmtool/gsmtool.cpp
index 6fea596..e6122ad 100644
--- a/noncore/unsupported/gsmtool/gsmtool.cpp
+++ b/noncore/unsupported/gsmtool/gsmtool.cpp
@@ -194,199 +194,195 @@ void GSMTool::doSMSTypeChanged()
 			qDebug("yes\n");
 			char buf[3];
 			snprintf(buf, 3,  "%d", e->index());
 			new QListViewItem(SMSList, message->address()._number.c_str(), message->serviceCentreTimestamp().toString().c_str(), buf);
 		} 
 	}		
 }
 
 void GSMTool::doSelectedSMSChanged(QListViewItem *item)
 {
 	qDebug("message changed\n");
 
 	if (!item || sms_store == NULL) {
 		SMSText->setText("");
 		SMSText->setEnabled(FALSE);
 		SMSDeleteButton->setEnabled(FALSE);
 		SMSSendButton->setEnabled(FALSE);
 		return;
 	}
 	/* ARGH. This sucks. Surely there's an app-private pointer in the
 	   QListViewItem that I've failed to notice? 
 
 	SMSMessageRef message = *(SMSMessageRef*)item->private;   
 	*/
 	qDebug("item %p\n", item);
 
 	qDebug("text(2) is %s\n", item->text(2).ascii());
 	int index = atoi(item->text(2).ascii());
 	qDebug("index %d\n", index);
 	SMSMessageRef message = sms_store->find(index)->message();
 
 	SMSText->setText(message->userData().c_str());
 	SMSText->setEnabled(TRUE);
 	SMSDeleteButton->setEnabled(TRUE);
 	SMSSendButton->setEnabled(TRUE);
 
 }
 
 void GSMTool::doSMSSendButton()
 {
 	qDebug("SMSSendButton");
 
 	QListViewItem *item = SMSList->currentItem();
 	if (!item)
 		return;
 
 	int index = atoi(item->text(2).ascii());
 	qDebug("index %d\n", index);
 
 	int direction = SMSViewType->currentItem();
 	qDebug("direction %s\n", direction?"outgoing":"incoming");
 
 	SMSMessageRef message = sms_store->find(index)->message();
 
 	if (direction)
 		NewSMSText->setText(message->userData().c_str());
 	else 
 		NewSMSText->setText("");
 	NewSMSToBox->insertItem(message->address()._number.c_str(), 0);
 	TabWidget2->setCurrentPage(3);
 
 }
 
 void GSMTool::doNewSMSClearButton()
 {
 	NewSMSText->setText("");
 }
 
 void GSMTool::doNewSMSSaveButton()
 {
 	qDebug("NewSMSSaveButton");
 	const char *msgtext = strdup(NewSMSText->text().local8Bit());
 	const char *dest = NewSMSToBox->currentText().ascii();
 
 	NewSMSStatusLabel->setText("Sending...");
 	me->setMessageService(1);
 
 	qDebug("NewSMSSendButton: '%s' to '%s'", msgtext, dest);
 
         SMSMessageRef m = new SMSSubmitMessage (msgtext, dest);
 	sms_store->insert(m);
 	free((void *)msgtext);
 		
 }
 void GSMTool::doNewSMSSendButton()
 {
 	const char *msgtext = strdup(NewSMSText->text().local8Bit());
 	const char *dest = NewSMSToBox->currentText().ascii();
 
 	NewSMSStatusLabel->setText("Sending...");
 	me->setMessageService(1);
 
 	qDebug("NewSMSSendButton: '%s' to '%s'", msgtext, dest);
 
         SMSSubmitMessage m(msgtext, dest);
 	try {
-		Ref<SMSMessage> ackPDU;
 		m.setAt(new GsmAt(*me));
-		m.send(ackPDU);
+		m.send();
 		
-		// print acknowledgement if available
-		if (! ackPDU.isnull())
-			cout << ackPDU->toString();
 		NewSMSStatusLabel->setText("Message sent.");
 	} catch (GsmException &ge) {
 		NewSMSStatusLabel->setText("Failed.");
 		qDebug(ge.what());
 	}
 	free((void *)msgtext);
 		
 
 }
 
 
 void GSMTool::doSMSDeleteButton()
 {
 	QListViewItem *item = SMSList->currentItem();
 	if (!item)
 		return;
 
 	int index = atoi(item->text(2).ascii());
 	qDebug("delete SMS with index %d\n", index);
 
 
 
 	SortedSMSStore::iterator e = sms_store->find(index);
 
 	if (e != sms_store->end()) {
 		qDebug("message is %s\n", e->message()->userData().c_str());
 			sms_store->erase(e);
 		
 	}
 	doSMSTypeChanged();
 }
 
 void GSMTool::doScanButton()
 {
 	qDebug("ScanButton");
 
 	NetworkList->setEnabled(FALSE);
 	AvailNetsLabel->setEnabled(FALSE);
 	NetworkList->clear();
 	new QListViewItem(NetworkList, "Scanning...");
 
 	vector<OPInfo> opis;
 
 	try {
 		opis = me->getAvailableOPInfo();
 	} catch (GsmException) {
 		NetworkList->clear();
 		new QListViewItem(NetworkList, "Scan failed...");
 		return;
 	}
 	
 	NetworkList->clear();
 	for (vector<OPInfo>::iterator i = opis.begin(); i != opis.end(); ++i) {
 		char *statustext;
 		switch (i->_status) {
 
 		case UnknownOPStatus:
 			statustext = "unknown";
 			break;
 			
 		case CurrentOPStatus: 
 			statustext = "current";
 			break;
 
 		case AvailableOPStatus:
 			statustext = "available";
 			break;
 
 		case ForbiddenOPStatus:
 			statustext = "forbidden";
 			break;
 		       
 		default:
 			statustext = "(ERROR)";
 		}
 		char num[7];
 		snprintf(num, 6, "%d", i->_numericName);
 		new QListViewItem(NetworkList, i->_longName.c_str(), statustext, num, i->_shortName.c_str());
       }
 	NetworkList->setEnabled(TRUE);
 	AvailNetsLabel->setEnabled(TRUE);
 }
 /*
  *  A simple slot... not very interesting.
  */
 void GSMTool::doConnectButton()
 {
 	gsmlib::Port *port;
 
 	speed_t rate;
 	devicename = strdup(DeviceName->currentText().local8Bit().data());
 	rate = baudrates[BaudRate->currentItem()];
 
 	qDebug("Connect Button Pressed");
 	MfrText->setText("Opening...");
 	ModelText->setText("");