← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty

« back to all changes in this revision

Viewing changes to kpty/kptydevice.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning, Jonathan Thomas, Andreas Wenning
  • Date: 2009-04-01 05:55:52 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090401055552-uel5di5f3xiftax3
Tags: 4:4.2.2-0ubuntu1
https://launchpad.net/bugs/344709
https://launchpad.net/bugs/348823
[ Jonathan Thomas ]
* New upstream release (LP: #344709, #348823):
  - Bump upstreamversion and runtimedeps in debian/rules
  - Remove kubuntu_65_kcmdlineargs_decoding_svn934640.diff, applied upstream

[ Andreas Wenning ]
* Remove patch kubuntu_69_do_not_show_plasma_popups_over_screensaver.diff,
  applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kpty/kptydevice.cpp
303
303
        NO_INTR(readBytes, read(q->masterFd(), ptr, available));
304
304
        if (readBytes < 0) {
305
305
            readBuffer.unreserve(available);
306
 
            q->setErrorString(I18N_NOOP("Error reading from PTY"));
 
306
            q->setErrorString(i18n("Error reading from PTY"));
307
307
            return false;
308
308
        }
309
309
        readBuffer.unreserve(available - readBytes); // *should* be a no-op
337
337
            write(q->masterFd(),
338
338
                  writeBuffer.readPointer(), writeBuffer.readSize()));
339
339
    if (wroteBytes < 0) {
340
 
        q->setErrorString(I18N_NOOP("Error writing to PTY"));
 
340
        q->setErrorString(i18n("Error writing to PTY"));
341
341
        return false;
342
342
    }
343
343
    writeBuffer.free(wroteBytes);
422
422
                break;
423
423
            return false;
424
424
        case 0:
425
 
            q->setErrorString(I18N_NOOP("PTY operation timed out"));
 
425
            q->setErrorString(i18n("PTY operation timed out"));
426
426
            return false;
427
427
        default:
428
428
            if (FD_ISSET(q->masterFd(), &rfds)) {
478
478
        return true;
479
479
 
480
480
    if (!KPty::open()) {
481
 
        setErrorString(I18N_NOOP("Error opening PTY"));
 
481
        setErrorString(i18n("Error opening PTY"));
482
482
        return false;
483
483
    }
484
484
 
492
492
    Q_D(KPtyDevice);
493
493
 
494
494
    if (!KPty::open(fd)) {
495
 
        setErrorString(I18N_NOOP("Error opening PTY"));
 
495
        setErrorString(i18n("Error opening PTY"));
496
496
        return false;
497
497
    }
498
498