1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

4481 Commits

Author SHA1 Message Date
minj
51610c774d update Lithuanian translation 2015-11-14 20:40:26 +02:00
Ferit Tunçer
db310713cf Turkish Translation Revised #4 2015-11-14 11:14:50 +02:00
Zetok Zalbavar
4d54f5cd1b
Merge pull request #2566 from TheNain38:patch-2
Update French translation of "Logout" and "Exit"
2015-11-14 07:04:25 +00:00
TheNain38
29a30da523 Update French translation of "Logout" and "Exit" 2015-11-13 17:29:37 +01:00
Zetok Zalbavar
2557b32d34
Merge pull request #2563 from ferittuncer:master
Turkish Translation Revised
2015-11-13 07:30:54 +00:00
Ferit Tunçer
2a36d45041 Turkish Translation Revised 2015-11-13 01:50:12 +02:00
agilob
09405f2493
Scroll public key to left after creation in aboutUser 2015-11-12 21:52:54 +00:00
agilob
6d440e9c8c
Minor UI fix 2015-11-12 21:51:43 +00:00
agilob
d3548f7a80
Resize avatar in aboutUser to 75x75 2015-11-12 21:49:27 +00:00
agilob
8d1197903c
Make dir chooser work in aboutUser, code cleanup 2015-11-12 21:46:43 +00:00
agilob
b85e12b0fc
Make autoaccept per user work from aboutUser window 2015-11-12 21:30:54 +00:00
agilob
a148e4dc5e
Improve avatar quality in aboutUser window 2015-11-12 21:13:37 +00:00
agilob
ad5301eef7
Improve layout in aboutUser window 2015-11-12 20:33:57 +00:00
Zetok Zalbavar
387009260d
Merge pull request #2561 from ferittuncer:master
Turkish Translation by MarmaraGNU<mgnu.org>
2015-11-12 12:46:30 +00:00
Ferit Tunçer
a7440d3681 Turkish Translation by MarmaraGNU<mgnu.org> 2015-11-12 14:41:14 +02:00
agilob
b4083f0074
Merge remote-tracking branch 'thenain38/patch-2' 2015-11-11 18:34:03 +00:00
TheNain38
2ae4524e33 Change 'minutes' to 'min' and remove translation 2015-11-11 18:24:15 +01:00
agilob
6bc8127ad3
Merge remote-tracking branch 'thenain38/patch-2' 2015-11-10 19:41:13 +00:00
TheNain38
eb3ec79b20 Fix #2301 and use QStringLiteral for comparison 2015-11-10 20:20:07 +01:00
tux3
5b42b9984b
Revert "Attempt to fix QDataStream operator<< ODR violation"
This reverts commit afe2dbd128.
2015-11-10 15:57:55 +01:00
tux3
3c51928473
Merge branch 'pr2544' 2015-11-10 01:20:10 +01:00
tux3
787865a23e
Show notifications even when busy 2015-11-09 23:27:00 +01:00
tux3
afe2dbd128
Attempt to fix QDataStream operator<< ODR violation 2015-11-09 23:23:32 +01:00
agilob
08212ad781
Add about window classes 2015-11-09 20:56:22 +00:00
agilob
5ec6840384
Add aboutwindow in qtox.pro 2015-11-09 20:55:31 +00:00
agilob
b9a168dffe
Add action for about window in context menu 2015-11-09 20:55:11 +00:00
agilob
95b5a75d0e
Add settings for notes per user 2015-11-09 20:54:28 +00:00
agilob
170eb931ff
Add status message setter and getter 2015-11-09 20:53:24 +00:00
kehugter
0667aa72f7 Updated Spanish translation 2015-11-09 21:27:00 +01:00
tux3
a052e3c452
Merge branch 'pr2543' 2015-11-09 20:04:36 +01:00
agilob
0b999e077e
Move logout tray menu action after profileForm initialization
fixes #2541
2015-11-09 18:48:00 +00:00
agilob
49bf1cf774
Fix resources URI: change double slash to one and add one if missing 2015-11-09 18:42:53 +00:00
tux3
8a3c9d14c0
Merge branch 'pr2539' 2015-11-09 02:36:16 +01:00
tux3
d6c042b35e
Merge branch 'pr2538' 2015-11-09 02:20:03 +01:00
TheNain38
d8d64fc56a Fix HTML Parsing 2015-11-09 01:19:33 +01:00
TheNain38
1a1e296c86 Allow to scroll on QCheckBox and consistancy 2015-11-09 01:14:33 +01:00
tux3
be967e88a3
Merge branch 'pr2537' 2015-11-08 23:22:44 +01:00
Andrius Štikonas
b27a6139d2 Update Lithuanian translation 2015-11-08 21:52:11 +00:00
tux3
f9c324c0f2
Merge branch 'pr2532' 2015-11-08 21:26:19 +01:00
TheNain38
7cdd6e3dd9 Add an event filter so you can't scroll on sliders 2015-11-08 21:20:42 +01:00
tux3
cc18700a18
Merge branch 'pr2533' 2015-11-08 17:42:12 +01:00
tux3
0670adfd7b
Merge branch 'pr2531' 2015-11-08 16:23:40 +01:00
agilob
7189844b2a
Use SVG renderer to scale down SVG in tray icon menu 2015-11-08 15:11:19 +00:00
TheNain38
5ff2a4e37a Fix groupwidget not unregistered from Translator 2015-11-08 14:22:02 +01:00
tux3
a8746e6857
Cleanup duplicate slider slots in AVForm
See #2528
2015-11-08 13:40:32 +01:00
tux3
b6d752fd4b
Fix second bug in #2528 2015-11-08 13:28:51 +01:00
tux3
9d527e7edd
Fix #2528 2015-11-08 12:36:18 +01:00
tux3
1b0d3797b1
Merge branch 'pr2518' 2015-11-08 12:06:22 +01:00
tux3
d1565188ac
Fix #2527 2015-11-08 02:28:24 +01:00
tux3
523e419adf
Fix theoritical A/V deadlock
Could only be hit by pausing at a key point in a debugger until the call timed-out.

Having one thread going up the call stack and acquiring locks (toxcore callbacks), while another thread goes down taking locks in the other order (CoreAV calling toxav functions) creates some pretty freezy situations.

The deadlock was caused by the GUI thread calling the CoreAV thread, acquiring the CoreAV callback, then right before calling a toxav function, not schedule the thread until the call times out. At this point the toxcore thread fires its state callback to tell us the call is over, locking internal toxcore/toxav mutexes, it reaches our callback function which tries to switch to the CoreAV thread to clean up the call data structures, but has to wait since the CoreAV thread holds its own lock. At this point if we resume the CoreAV thread, it'll be busy calling into a toxav function, which tries to acquire internal toxav locks, those locks are held by the toxcore callback so we deadlock.

Our solution is that when getting a toxcore callback, we immediately switch to a temporary thread, allowing toxcore to release the locks it held, and that temporary thread tries to switch to do work on call data structures. Meanwhile if the CoreAV thread needs internal toxcore locks, it can get them.
2015-11-08 00:32:32 +01:00