Commit Graph

683 Commits

Author SHA1 Message Date
Jonathan Warren
21ce1f5a19 manual merge 2013-07-05 16:56:49 -04:00
Jonathan Warren
39f4f85b11 removed apparently unnecessary loop 2013-07-05 16:43:40 -04:00
Jonathan Warren
1f8eee4119 removed apparently unnecessary loop 2013-07-05 16:01:20 -04:00
Jonathan Warren
5f87415395 Merge pull request #281 from pgimeno/cpu100percentfix
Better fix for issue #183
2013-07-02 19:29:04 -07:00
Pedro Gimeno
55b899f5c1 Better fix for issue #183
The former patch was too local; this one integrates better with the structure of the code.
2013-07-02 17:43:54 +02:00
Jonathan Warren
2012096673 Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master 2013-07-01 15:51:55 -04:00
Jonathan Warren
b4e292e280 Merge pull request #275 from fuzzgun/master
Altered Makefile to avoid needing to chase changes
2013-07-01 10:10:57 -07:00
Jonathan Warren
e2f9b01558 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-07-01 13:06:13 -04:00
Jonathan Warren
e8f09c2110 Merge pull request #277 from pgimeno/cpu100percentfix
Fix issue #183 (CPU 100% usage)
2013-07-01 10:05:39 -07:00
Pedro Gimeno
95a1afb84b Fix issue #183 (CPU 100% usage)
As per http://docs.python.org/2/howto/sockets.html#using-a-socket it's
possible that a socket recv() call returns 0 bytes if the remote closes
the connection. In that case, recv() does not obey settimeout(): it
just doesn't block and returns zero bytes immediately, which in this
case results in an infinite loop if the transmission was incomplete.
2013-07-01 07:36:22 +02:00
fuzzgun
b038edf2b2 Repairing debian packaging 2013-06-30 16:16:41 +01:00
fuzzgun
3e079787be Altered Makefile to avoid needing to chase changes 2013-06-30 11:17:49 +01:00
Linker Lin
4a84a30fc6 replace acquire lock by 'with' statement 2013-06-30 01:29:35 +08:00
linkerlin
80e5adad8c Made it compatible with gevent 1.0dev version. 2013-06-28 22:26:31 +08:00
miao.lin
284b3a24f7 Put setDaemon inside init. 2013-06-28 18:22:10 +08:00
miao.lin
9fa90ccc3f Sleep more , save more. 2013-06-28 17:50:43 +08:00
miao.lin
e8eaf65f07 Sleep more , save more. 2013-06-28 17:48:32 +08:00
miao.lin
3eea6d6a88 Removed a blank line. 2013-06-28 17:28:17 +08:00
miao.lin
5df22b4181 Made gevent happy with PyQt. 2013-06-28 16:45:03 +08:00
miao.lin
0aa7efab34 renamed class BGWorker to bgWorker 2013-06-28 15:43:24 +08:00
miao.lin
e47d35769b renamed class BGWorker to bgWorker 2013-06-28 15:36:34 +08:00
miao.lin
6facca4cb3 Added a class for background working 2013-06-28 15:25:31 +08:00
Jonathan Warren
4fd7ff59d3 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-26 14:26:01 -04:00
Jonathan Warren
bfdb04716a Merge pull request #265 from Atheros1/master
Various changes. Now on PyBitmessage v0.3.4
2013-06-26 11:24:56 -07:00
Jonathan Warren
0f8b9f97bd Increment version number to 0.3.4 2013-06-26 14:22:13 -04:00
Jonathan Warren
20994adf78 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-26 14:01:17 -04:00
Jonathan Warren
9230e40e29 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-06-26 14:01:03 -04:00
Jonathan Warren
9f95df9e8d Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-26 13:59:22 -04:00
Jonathan Warren
e9fbbe3dcc Merge pull request #261 from xj9/xdg
Fixed issue #157: Use $XDG_CONFIG_HOME
2013-06-26 10:54:37 -07:00
Jonathan Warren
b83b46a1b7 Merge pull request #259 from fiatflux/filename_fix
Rename files with spaces in names.
2013-06-26 10:47:04 -07:00
Jonathan Warren
1657dfec24 Move code related to settings file upgrade 2013-06-26 13:35:53 -04:00
Jonathan Warren
0b08fe6bad Some initial coding work for chans 2013-06-26 11:55:33 -04:00
Jonathan Warren
be322d58bd Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-06-26 11:23:58 -04:00
Carlos Killpack
ad5517b41b Fixed issue #157: Use $XDG_CONFIG_HOME 2013-06-26 03:11:32 -06:00
Gregor Robinson
84035772f2 Rename files with spaces in names.
These filenames are technically allowed, but aren't that fun.
2013-06-25 21:28:06 +00:00
Jonathan Warren
8bd00dc730 added newchandialog.py 2013-06-25 17:14:44 -04:00
Jonathan Warren
94835ab8ae Merge pull request #257 from Atheros1/master
added missing imports
2013-06-25 13:26:59 -07:00
Jonathan Warren
b6c1467d80 added missing imports 2013-06-25 16:26:12 -04:00
Jonathan Warren
f905ea1725 Merge pull request #252 from DivineOmega/adjust_connections_list_gui
Visual change to list of connections per stream on 'Network Status' tab
2013-06-24 21:00:55 -07:00
Jonathan Warren
befe790334 Merge pull request #241 from Jaxkr/master
Fixed capitalization of "Application Support"
2013-06-24 20:58:47 -07:00
Jonathan Warren
1b13b74dbd Merge pull request #251 from deliaeris/patch-1
spelling
2013-06-24 20:57:48 -07:00
Jonathan Warren
c4d09693d5 Merge pull request #240 from acejam/master
Added folder to select statement & changed received to receivedTime
2013-06-24 20:56:58 -07:00
Jonathan Warren
d9632e7e90 Merge pull request #254 from Atheros1/master
apiAddressGeneratorReturnQueue is now in the shared module
2013-06-24 20:46:55 -07:00
Jonathan Warren
5bb339c0fe apiAddressGeneratorReturnQueue is now in the shared module 2013-06-24 23:41:20 -04:00
Jonathan Warren
b09fc6fd86 Merge pull request #253 from Atheros1/master
Separated code in to many individual modules
2013-06-24 20:24:50 -07:00
Jonathan Warren
61ab0013aa added new variable: doTimingAttackMitigation 2013-06-24 17:29:15 -04:00
Jonathan Warren
3204c6b833 added new variable: doTimingAttackMitigation 2013-06-24 17:29:04 -04:00
Jonathan Warren
acb8b51e00 sock.sendall errors need-not go to stderr 2013-06-24 17:00:35 -04:00
Jonathan Warren
5a7d86cca9 Fix edge-case bug in possibleNewPubkey function 2013-06-24 16:57:19 -04:00
Jonathan Warren
dacd9aa925 Add strftime import 2013-06-24 16:25:31 -04:00