Hi Alex,
can you please review the proposed patch in #440 [1]?
Thanks, Mike
[1] http://bugs.x2go.org/440
DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Hi Mike,
it seems good to me. However I can not apply this patch on master branch:
$ git apply --check switch-to-QNetworkAccessManager.patch error: patch failed: httpbrokerclient.cpp:93 error: httpbrokerclient.cpp: patch does not apply error: patch failed: httpbrokerclient.h:62 error: httpbrokerclient.h: patch does not apply
please send correct patch for master branch *without* trailing whitespaces and I'll test and apply it.
regards, Alex
Am 27.02.2014 16:15, schrieb Mike Gabriel:
Hi Alex,
can you please review the proposed patch in #440 [1]?
Thanks, Mike
--
Oleksandr Shneyder | Email: o.shneyder@phoca-gmbh.de phoca GmbH | Tel. : 0911 - 14870374 0 Bräuhausgasse 9 | Fax. : 0911 - 14870374 9 D-82205 Gilching | Mobil: 0163 - 49 64 461
Geschäftsführung: Dipl.-Inf. Oleksandr Shneyder
Amtsgericht München | http://www.phoca-gmbh.de HRB 196 658 | http://www.x2go.org USt-IdNr.: DE281977973
Not sure what happened, I just rebaselined and recreated the patch. New patch attached. Note this also includes possible fix for bug 138.
One last try. Cleaned up trailing white space, removed password from debug output, and fixed some spacing.
Hi,
http://code.x2go.org/gitweb?p=x2goclient.git;a=commit;h=d02396443b667e3c2217...
@All:
please test it with http(s) brokers.
regards, Alex
Am 01.03.2014 05:05, schrieb Josh Lukens:
One last try. Cleaned up trailing white space, removed password from debug output, and fixed some spacing.
X2Go-Dev mailing list X2Go-Dev@lists.berlios.de https://lists.berlios.de/mailman/listinfo/x2go-dev
--
Oleksandr Shneyder | Email: o.shneyder@phoca-gmbh.de phoca GmbH | Tel. : 0911 - 14870374 0 Bräuhausgasse 9 | Fax. : 0911 - 14870374 9 D-82205 Gilching | Mobil: 0163 - 49 64 461
Geschäftsführung: Dipl.-Inf. Oleksandr Shneyder
Amtsgericht München | http://www.phoca-gmbh.de HRB 196 658 | http://www.x2go.org USt-IdNr.: DE281977973
Hi Alex,
On Mo 03 Mär 2014 11:48:19 CET, Oleksandr Shneyder wrote:
Hi,
http://code.x2go.org/gitweb?p=x2goclient.git;a=commit;h=d02396443b667e3c2217...
@All:
please test it with http(s) brokers.
I have just reverted [1] that committed and re-added it with an
appropriate changelog entry [2] that will close the related bugs.
Please update your working copy before pushing new commits.
Greets, Mike
[1]
http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=1bd49018334c1bc6...
[2]
http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=19fe7875e2b82037...
DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Found a small (but important) copy and paste error introduced when I remade the origional patch. As is session broker sessions can't be properly selected. The attached patch against head corrects the issue.
On Mi 05 Mär 2014 04:39:40 CET, Josh Lukens wrote:
Found a small (but important) copy and paste error introduced when I
remade the origional patch. As is session broker sessions can't be
properly selected. The attached patch against head corrects the
issue.
Committed and pushed: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=040c9423c2806de3...
THANKS! Mike
DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148
GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
-
Josh Lukens -
Mike Gabriel -
Oleksandr Shneyder