Diffstat (limited to 'noncore/net/opietooth/manager/obexdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index d3fdd14..8d7b593 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp | |||
@@ -88,50 +88,50 @@ void ObexDialog::browse() { | |||
88 | QString str = OFileDialog::getOpenFileName( 1,"/","", types, 0 ); | 88 | QString str = OFileDialog::getOpenFileName( 1,"/","", types, 0 ); |
89 | cmdLine->setText( str ); | 89 | cmdLine->setText( str ); |
90 | statLine->setText( tr("Ready") ); | 90 | statLine->setText( tr("Ready") ); |
91 | } | 91 | } |
92 | 92 | ||
93 | void ObexDialog::sendData() { | 93 | void ObexDialog::sendData() { |
94 | QString fileURL = cmdLine->text(); | 94 | QString fileURL = cmdLine->text(); |
95 | QString file = QFileInfo( fileURL ).fileName(); | 95 | QString file = QFileInfo( fileURL ).fileName(); |
96 | QString modifiedName = chNameLine->text(); | 96 | QString modifiedName = chNameLine->text(); |
97 | QString execName = "ussp-push"; | 97 | QString execName = "ussp-push"; |
98 | 98 | ||
99 | if (obexSend->isRunning()) | 99 | if (obexSend->isRunning()) |
100 | return; | 100 | return; |
101 | obexSend->clearArguments(); | 101 | obexSend->clearArguments(); |
102 | // vom popupmenu beziehen | 102 | // vom popupmenu beziehen |
103 | if ( !modifiedName.isEmpty() ) { | 103 | if ( !modifiedName.isEmpty() ) { |
104 | *obexSend << execName << "--timeo 30" << m_device << fileURL << modifiedName; | 104 | *obexSend << execName << "--timeo 30" << m_device << fileURL << modifiedName; |
105 | } else { | 105 | } else { |
106 | *obexSend << execName << "--timeo 30" << m_device << fileURL << file; | 106 | *obexSend << execName << "--timeo 30" << m_device << fileURL << file; |
107 | } | 107 | } |
108 | obexSend->setUseShell(true); | 108 | obexSend->setUseShell(true); |
109 | if (!obexSend->start(OProcess::NotifyOnExit, OProcess::All) ) { | 109 | if (!obexSend->start(OProcess::NotifyOnExit, OProcess::All) ) { |
110 | statLine->setText( tr("Error: couln't start process") ); | 110 | statLine->setText( tr("Error: couln't start process") ); |
111 | } | 111 | } |
112 | else | 112 | else |
113 | statLine->setText( tr("Sending") ); | 113 | statLine->setText( tr("Sending") ); |
114 | } | 114 | } |
115 | 115 | ||
116 | void ObexDialog::slotPushOut(OProcess*, char* buf, int len) { | 116 | void ObexDialog::slotPushOut(OProcess*, char* buf, int len) { |
117 | QCString str(buf, len); | 117 | QCString str(buf, len); |
118 | status->append(str); | 118 | status->append(str); |
119 | } | 119 | } |
120 | 120 | ||
121 | void ObexDialog::slotPushErr(OProcess*, char* buf, int len) { | 121 | void ObexDialog::slotPushErr(OProcess*, char* buf, int len) { |
122 | QCString str(buf, len); | 122 | QCString str(buf, len); |
123 | status->append(str); | 123 | status->append(str); |
124 | } | 124 | } |
125 | 125 | ||
126 | void ObexDialog::slotProcessExited(OProcess*) { | 126 | void ObexDialog::slotProcessExited(OProcess*) { |
127 | if (obexSend == NULL) | 127 | if (obexSend == NULL) |
128 | return; | 128 | return; |
129 | if (obexSend->normalExit()) { | 129 | if (obexSend->normalExit()) { |
130 | status->append( tr("Finished with result ") ); | 130 | status->append( tr("Finished with result ") ); |
131 | status->append( QString::number(obexSend->exitStatus()) ); | 131 | status->append( QString::number(obexSend->exitStatus()) ); |
132 | status->append( tr("\n") ); | 132 | status->append( tr("\n") ); |
133 | odebug << obexSend->exitStatus() << oendl; | 133 | odebug << obexSend->exitStatus() << oendl; |
134 | statLine->setText( tr("Finished: ") + tr(strerror(obexSend->exitStatus())) ); | 134 | statLine->setText( tr("Finished: ") + tr(strerror(obexSend->exitStatus())) ); |
135 | } | 135 | } |
136 | else { | 136 | else { |
137 | status->append( tr("Exited abnormally\n") ); | 137 | status->append( tr("Exited abnormally\n") ); |