summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorLines
2017-12-14Adaptions for API change in json-c v0.130.15.1Furkan Sahin-26/+41
Lift restriction on json-c <= 0.12.1 ipc-server: Acquire ownership of referenced json_object properly When adding a referenced json_object with an unknown lifetime to another json_object, it must be done with a wrapped call to json_object_get() to acquire the ownership of that json_object.
2017-12-17Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15"Furkan Sahin-48/+17
This reverts commit a427d79c013a14ce196ca8dac5644ff2c76637ca, reversing changes made to f896cb48106e704a57f93790b46fa7e183d646eb.
2017-12-17Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15Furkan Sahin-17/+48
2017-12-16Merge pull request #1519 from ggreer/clear-password-buffer-0.15Furkan Sahin-30/+25
Swaylock: Clear password buffer after use.
2017-12-14Merge pull request #1515 from 4e554c4c/holds_up_forkFurkan Sahin-25/+29
Fix `swaylock -f`
2017-12-14Adaptions for API change in json-c v0.13Furkan Sahin-15/+29
2017-12-14ipc-server: Acquire ownership of referenced json_object properlyFurkan Sahin-1/+2
When adding a referenced json_object with an unknown lifetime to another json_object, it must be done with a wrapped call to json_object_get() to acquire the ownership of that json_object.
2017-12-14Lift restriction on json-c <= 0.12.1Furkan Sahin-10/+10
2017-12-13Fix `swaylock -f`Furkan Sahin-25/+29
This commit makes swaylock poll the registry the first time in its fork in order for sway to recognize it and grant it lock privileges
2017-12-13Swaylock: Clear password buffer after use.Furkan Sahin-30/+25
After a user enters or clears a password, try to overwrite the buffer containing it. That way it's not sitting around in RAM for something else to read later. Also, mlock() the password buffer so that it is never swapped out. This also replaces the dynamically allocated buffer with a static char[1024]. Any characters past that are discarded until the user hits enter or escape.
2017-11-05Merge pull request #1455 from etam/dbus_dependencyFurkan Sahin-1/+4
Update dbus dependency
2017-11-05Add dbus info to readmeFurkan Sahin-0/+3
2017-11-05Merge pull request #1454 from etam/fix_init_trayFurkan Sahin-1/+1
Fix init_tray function declaration
2017-11-05Dbus must be at least version 1.10Furkan Sahin-1/+1
Function dbus_message_iter_get_element_count is available since 1.10.
2017-11-05Fix init_tray function declarationFurkan Sahin-1/+1
This fixes compilation failure: error: call to function 'init_tray' without a real prototype
2017-11-02Merge pull request #1443 from gferon/gferon-readme-editFurkan Sahin-8/+8
Update README.md
2017-11-01Merge pull request #1446 from kon14/patch-10.15.0Furkan Sahin-1/+1
Update README.el.md
2017-11-01Merge pull request #1446 from kon14/patch-1Furkan Sahin-1/+1
Update README.el.md
2017-11-01Merge pull request #1445 from yuilib/update-readme-jaFurkan Sahin-30/+24
Update README.ja.md
2017-11-05Merge pull request #1455 from etam/dbus_dependencyFurkan Sahin-1/+4
Update dbus dependency
2017-11-02Merge pull request #1443 from gferon/gferon-readme-editFurkan Sahin-8/+8
Update README.md
2017-11-05Merge pull request #1454 from etam/fix_init_trayFurkan Sahin-1/+1
Fix init_tray function declaration
2017-11-01Merge pull request #1445 from yuilib/update-readme-jaFurkan Sahin-30/+24
Update README.ja.md
2017-11-01Update README.el.mdFurkan Sahin-1/+1
2017-11-01Update README.ja.mdFurkan Sahin-30/+24
2017-10-30Update README.mdFurkan Sahin-8/+8
2017-10-28Merge pull request #1441 from ptMuta/master0.15-rc4Furkan Sahin-1/+1
Removed trailing comma from swaybar click event json
2017-10-28Merge pull request #1441 from ptMuta/masterFurkan Sahin-1/+1
Removed trailing comma from swaybar click event json
2017-10-28Removed trailing comma from swaybar click event jsonFurkan Sahin-1/+1
2017-10-27Merge pull request #1436 from dlrobertson/add_asan_buildFurkan Sahin-1/+17
Add Address Sanitized build type
2017-10-27Merge pull request #1438 from mariusor/explicit_json-c_versionFurkan Sahin-12/+24
Explicitly setting the version of json-c required
2017-10-27Merge pull request #1438 from mariusor/explicit_json-c_versionFurkan Sahin-12/+24
Explicitly setting the version of json-c required
2017-10-27Explicitly setting the version of json-c requiredFurkan Sahin-12/+24
to 0.12.1. This is needed because the development version breaks the existing API of json_object_array_length() by moving the return from int to size_t. This would fix #1355
2017-10-26Add Address Sanitized build typeFurkan Sahin-1/+17
- Add -DCMAKE_BUILD_TYPE=ASAN to possible builds
2017-10-24Merge pull request #1430 from dlrobertson/nvidia_drmFurkan Sahin-0/+24
nvidia: Validate the nvidia_drm module options
2017-10-24Merge pull request #1430 from dlrobertson/nvidia_drmFurkan Sahin-0/+24
nvidia: Validate the nvidia_drm module options
2017-10-24nvidia: Validate the nvidia_drm module optionsFurkan Sahin-0/+24
When the proprietary nvidia driver is used, ensure the modeset option is set instead of checking /proc/cmdline for nvidia-drm.modeset=1.
2017-10-23Merge pull request #1427 from ranisalt/patch-1Furkan Sahin-6/+2
Use add_compile_options instead of interpolation
2017-10-23Merge pull request #1427 from ranisalt/patch-1Furkan Sahin-6/+2
Use add_compile_options instead of interpolation
2017-10-24Use add_compile_options instead of interpolationFurkan Sahin-6/+2
Uses CMake's `add_compile_options` directive instead of interpolating `CMAKE_C_FLAGS` for adding compilation flags.
2017-10-22Merge pull request #1425 from ggreer/grab-error0.15-rc3Furkan Sahin-1/+11
swaygrab: Add some error handling.
2017-10-22Merge pull request #1425 from ggreer/grab-errorFurkan Sahin-1/+11
swaygrab: Add some error handling.
2017-10-22swaygrab: Add some error handling.Furkan Sahin-1/+11
- If IPC response contains `success: false`, abort and print error message. - If tree has no nodes, abort with error msg instead of segfaulting.
2017-10-22Merge pull request #1424 from ggreer/swaygrab-jsonFurkan Sahin-1/+10
swaygrab: Prevent segfault if IPC response can't be parsed.
2017-10-22Merge pull request #1424 from ggreer/swaygrab-jsonFurkan Sahin-1/+10
swaygrab: Prevent segfault if IPC response can't be parsed.
2017-10-22swaygrab: Increase max depth of JSON parsing to 256. Prevent segfault if IPC ↵Furkan Sahin-1/+10
response can't be parsed. The default max nesting depth of json-c is 32, which can cause some valid trees to fail to be parsed, so increase that. Also instead of segfaulting, just abort and print the error returned by json-c.
2017-10-20Merge pull request #1419 from 4e554c4c/better_logsFurkan Sahin-5/+18
Print log level even if STDERR is not a tty
2017-10-20Merge pull request #1419 from 4e554c4c/better_logsFurkan Sahin-5/+18
Print log level even if STDERR is not a tty
2017-10-20Print log level even if STDERR is not a ttyFurkan Sahin-5/+18
Makes reading debug logs much easier, debug lines will start with `E`, info lines with `I` and error lines with `E`.
2017-10-20Remove broken link to Spanish translationFurkan Sahin-1/+1
Fixes #1417