libusermetrics

Merge lp:~pete-woods/libusermetrics/dont-wait-for-gettext into lp:libusermetrics

  1. dont-wait-for-gettext
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 172
Merged at revision: 173
Proposed branch: lp:~pete-woods/libusermetrics/dont-wait-for-gettext
Merge into: lp:libusermetrics
Diff against target: 22 lines (+4/-7)
1 file modified
src/libusermetricscommon/Localisation.cpp (+4/-7)
To merge this branch: bzr merge lp:~pete-woods/libusermetrics/dont-wait-for-gettext
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+234843@code.launchpad.net

Commit message

Don't wait for external gettext processes to close

Description of the change

Don't wait for external gettext processes to close

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/libusermetricscommon/Localisation.cpp'
2--- src/libusermetricscommon/Localisation.cpp 2013-07-17 11:40:21 +0000
3+++ src/libusermetricscommon/Localisation.cpp 2014-09-16 16:17:37 +0000
4@@ -29,14 +29,11 @@
5 gettext.setProcessEnvironment(env);
6 }
7
8+ gettext.setProcessChannelMode(QProcess::ForwardedErrorChannel);
9 gettext.start("gettext", QStringList() << textDomain << messageId);
10-
11- gettext.waitForStarted();
12- gettext.waitForReadyRead();
13-
14- QByteArray ba(gettext.readAll());
15-
16- gettext.waitForFinished();
17+ gettext.waitForReadyRead(200);
18+ QByteArray ba(gettext.readAllStandardOutput());
19+ gettext.kill();
20
21 return QString::fromUtf8(ba);
22 }

Subscribers

People subscribed via source and target branches

to all changes: