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

3247 Commits

Author SHA1 Message Date
tux3
fc084d2795
Merge branch 'pr1921' 2015-06-27 21:16:24 +02:00
tux3
b88eacb037
Merge branch 'pr1920' 2015-06-27 21:16:11 +02:00
tux3
645b1e5566
Fix raciness of encryption API
And make it saner by not having one global password that has to be set before encrypting/decrypting, which is as racy and poorly designed as it gets

Fixes #1917 's immediate symtoms, which some potential for other regressions due to the mess that is encrypted persistence currently
2015-06-27 21:14:35 +02:00
Zetok Zalbavar
413243f86b
Update install instructions 2015-06-27 19:16:47 +01:00
urras
55d04bf3cb
Update Debian dependencies 2015-06-27 13:38:28 -04:00
tux3
636faac4db
Fix #1919 2015-06-27 19:27:01 +02:00
tux3
79a9928c75
Link with -ffmpeg libav* sonames 2015-06-27 02:02:27 +02:00
tux3
9e55c77849
Better freeing of CameraSource 2015-06-26 19:04:53 +02:00
tux3
89080b949e
Merge branch 'video_overhaul' 2015-06-26 18:39:36 +02:00
tux3
2ab55568f2
Make the video code a singleton, fix multithreading bugs
There can now only be one CameraSource running.

Video frames are decoded in their own thread, and then converted by users in the user's threads.
The CameraSource API is entirely thread-safe and controls the video decoding thread.

The video device only stays open as long as there are users subscribed to the CameraSource.

We use a dangerous combination of spinlocks and memory fences to keep things synchronized.
2015-06-26 18:34:48 +02:00
tux3
b132443c80
Merge branch 'pr1908' 2015-06-26 14:16:30 +02:00
tux3
5e4abcb775
Refactor a strange return-early condition 2015-06-26 14:15:27 +02:00
tux3
79d335ff4c
Merge branch 'pr1890' 2015-06-26 14:13:03 +02:00
tux3
47c4fab08b
Merge branch 'friendlist' from PR #1879
Closes #1879 by rebasing and merging it
2015-06-26 13:47:29 +02:00
TheSpiritXIII
d2c0301103 Circles: Fix circle color on theme change, remove debugging stuff
Conflicts:
	res.qrc
2015-06-26 13:38:51 +02:00
TheSpiritXIII
b6df8ce34a Circles: Fix sort circles on menus, fix groupchat rename through widget, improve activity sort performance 2015-06-26 10:54:50 +02:00
TheSpiritXIII
484a9ea87e Circles: Fix crash when creating in category where it's not visible 2015-06-26 10:54:50 +02:00
TheSpiritXIII
7f7ab9a1bc Circles: Fix quick switch crash, remove circle crash 2015-06-26 10:54:50 +02:00
TheSpiritXIII
5c80d06ee9 Circles: Add while searching 2015-06-26 10:54:49 +02:00
TheSpiritXIII
8357095d8a Circles: Sort numbers at end, too 2015-06-26 10:54:49 +02:00
TheSpiritXIII
79424de10a Circles: Use history for activity, fix search 2015-06-26 10:54:49 +02:00
TheSpiritXIII
d9d6f20bf7 Circles: Fix convention, crash and activity cycling 2015-06-26 10:54:49 +02:00
TheSpiritXIII
858b005567 Circles: Fix memory leaks and extraneous saving 2015-06-26 10:54:49 +02:00
TheSpiritXIII
9dd277623a Fix circles: Fix rename on creation and graphical bug 2015-06-26 10:54:49 +02:00
TheSpiritXIII
c662c0aa92 Update activity on friendship, fix category friend removing (circles and activity) 2015-06-26 10:54:49 +02:00
TheSpiritXIII
e233d7d1c6 Allow circles to be created while sorted by activity 2015-06-26 10:54:49 +02:00
TheSpiritXIII
4ee38e7c69 Update activity on AV and files 2015-06-26 10:54:49 +02:00
TheSpiritXIII
ecdf863c02 Recent list selectable from drop list, bug fixes 2015-06-26 10:54:49 +02:00
TheSpiritXIII
c24a508c38 Switch between recent and alphabetical layouts 2015-06-26 10:54:49 +02:00
TheSpiritXIII
15f10c2f34 Recent list (right click empty list to test) 2015-06-26 10:54:49 +02:00
TheSpiritXIII
62873e9d71 Fix circle related rebase bugs 2015-06-26 10:54:49 +02:00
tux3
3a30a038ef Fix color of circle names 2015-06-26 10:54:49 +02:00
tux3
33a33ef051 Rebase on master 2015-06-26 10:54:49 +02:00
TheSpiritXIII
cc9edf6f90 Minor code cleanup for circles and related 2015-06-26 10:54:00 +02:00
TheSpiritXIII
8e796a1d8b Update renamed friends and groups during search 2015-06-26 10:54:00 +02:00
TheSpiritXIII
167a8971ec Search optimizations and bug fixes, rename focus fix 2015-06-26 10:54:00 +02:00
TheSpiritXIII
ac2263b3e8 Save circle settings after each modification 2015-06-26 10:54:00 +02:00
TheSpiritXIII
38fa6fc291 Fix sorting and cycling bugs for circles 2015-06-26 10:54:00 +02:00
TheSpiritXIII
0d4ca979bc Fix right click friend in circle 2015-06-26 10:54:00 +02:00
TheSpiritXIII
2c7f3de346 Fix circle error? 2015-06-26 10:54:00 +02:00
TheSpiritXIII
24f75a6b43 Don't show empty circles while searching 2015-06-26 10:54:00 +02:00
TheSpiritXIII
d4acf29fc0 Fix circle settings crash regression 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
334bc1ab17 Fix friend widget right click crash 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
e0b9e81938 Minor circle widget base class cleanup 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
715ef0ce65 Store circle widgets, fixed related bugs 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
10c7a745c5 Fix circle white box glitch, circle cycling 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
00022355e8 Fixed circle compact mode and sort bugs, inline text editing stylesheet 2015-06-26 10:53:59 +02:00
Daniel Hrabovcak
a0b312dd97 Fixed group and circle illegal chars, inline renaming for friend list widgets, sort circles alphabetically 2015-06-26 10:53:59 +02:00
Daniel Hrabovcak
27237e6164 Compact settings and minor circle widget cleanup 2015-06-26 10:53:01 +02:00
Daniel Hrabovcak
8f02d6c14c Circle context menus 2015-06-26 10:53:01 +02:00