about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #1123 from profanity-im/fix/1093-already-started-messageMichael Vetter2019-06-071-40/+25
|\ \ \ | | | | | | | | Print omemo start related msgs into correct window
| * | | Refactor cmd_omemo_startMichael Vetter2019-06-071-38/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some code was duplicated/similar. The parts about using a chatwin while being started from another window (recipient provided) and being a chatwin were the same. Like this it should be easier to read and less code.
| * | | Print omemo start related msgs into correct windowMichael Vetter2019-06-071-3/+3
| | | | | | | | | | | | | | | | | | | | Print them in the window of the contact. Not just the current window. Fix https://github.com/profanity-im/profanity/issues/1093
* | | | Merge pull request #1118 from profanity-im/fix/1117-omemo-autocompletion-crashMichael Vetter2019-06-071-26/+27
|\ \ \ \ | |/ / / |/| | | Only complete certain omemo commands if connected
| * | | Only complete certain omemo commands if connectedMichael Vetter2019-06-061-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the omemo commands depend on the roster being present. Several of those functions call `assert()` if that's not the case. Modify omemo autocompletion in such a way that only things that don't need the roster will be completed. Only works on first level. When typing `/omemo` it will still complete to `/omemo start` but not offer suggestions for that, but print a message that you need to be connected. Fix https://github.com/profanity-im/profanity/issues/1117
* | | | Merge pull request #1121 from profanity-im/feature/notify-plugin-failMichael Vetter2019-06-073-16/+31
|\ \ \ \ | |_|/ / |/| | | Improve plugin load/install failure message
| * | | Improve plugin load/install failure messageMichael Vetter2019-06-073-16/+31
| |/ / | | | | | | | | | | | | | | | In case Python or C plugins are disabled install/load failed silently. Notify the user that we can't load them because profanity was built without support for plugins.
* | | Merge pull request #1108 from optmzr/issue-1100Michael Vetter2019-06-067-139/+243
|\ \ \ | | | | | | | | Use travis matrix to test more systems (#1100)
| * | | Add Travis CI tests for Arch, Debian and OSX/macOSWilliam Wennerström2019-06-067-139/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Arch and Debian are run in Docker containers, as openSUSE Tumbleweed. + OSX/macOS doesn't use any containers. * Homebrew is used to fetch all the dependencies. * The dependencies are declared in the Brewfile.travis file. + The travis-build.sh script has been modified to check for the current OS and the different configure flags has been moved into an array that'll be looped through instead. The xscreensaver (for libXScrnSaver) flags has been removed for macOS as it only makes sense for systems running X11, which macOS doesn't (usually) do. + Some minor shellcheck fixes, too. Fixes: #1100
* | | | Add FUNDING.ymlgMichael Vetter2019-06-061-0/+12
| | | |
* | | | Merge pull request #1113 from profanity-im/fix/1112-autoconnectMichael Vetter2019-06-051-3/+11
|\ \ \ \ | |_|/ / |/| | | Check autoconnect set settings
| * | | Check for sane argument in autoconnect setMichael Vetter2019-06-051-4/+8
| | | | | | | | | | | | | | | | | | | | Check that user doesnt do `/autoconnect set `. Which would result in: `Account '(null)' does not exist`.
| * | | Check if valid account before setting autoconnectMichael Vetter2019-06-051-3/+7
|/ / / | | | | | | | | | Fixes https://github.com/profanity-im/profanity/issues/1112
* | | Merge pull request #1111 from profanity-im/feature/theme-omemo-charMichael Vetter2019-06-056-0/+13
|\ \ \ | | | | | | | | Add omemo.char to themes
| * | | Add omemo.char to themesMichael Vetter2019-06-055-0/+5
| | | |
| * | | Add omemo.char theme optionMichael Vetter2019-06-051-0/+8
|/ / / | | | | | | | | | Thanks to @kaffekanne for noticing this!
* | / Document statusbar.time theme featureMichael Vetter2019-06-0516-0/+16
| |/ |/| | | | | | | | | | | Users where under the impression that you can't colour the time displayed in the statusbar. Let's add it to the template, and also change all themes to use the same colour for the time as for the statusbar text.
* | Merge pull request #1109 from profanity-im/fix/1083Michael Vetter2019-06-053-28/+47
|\ \ | | | | | | Fix SIGABRT on lost connection
| * | statusbar: check if roster existsMichael Vetter2019-06-043-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We destory the roster in ev_disconnect_cleanup(). Adding a function to test if the roster has been destroyed and testing for it in the statusbar. So now when the connection is lost 'Lost connection' is printed in all open windows. We can then reconnect with `/connect accountname`. Should fix https://github.com/profanity-im/profanity/issues/1083
| * | statusbar: reduce duplicate codeMichael Vetter2019-06-041-32/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | status_bar_new() and status_bar_active() are almost identical. Let's use one helper function to not duplicate code. I thought about renaming both functions into one and adding another parameter but didn't come up with a good name for the function that clearly describes what it does. So staying with current names + helper functions.
| * | Determine chat window names beforehandMichael Vetter2019-06-041-13/+44
| |/ | | | | | | | | | | | | | | | | Save the name for displaying the windows in the statusbar inside the tab object. So far we calculated them repeatedly and this created issues when we lost the connection. Regards https://github.com/profanity-im/profanity/issues/1083
* / Add release dates to changelogMichael Vetter2019-06-051-5/+5
|/
* Merge pull request #1106 from profanity-im/saved-accountMichael Vetter2019-06-031-28/+7
|\ | | | | Don't clear saved account data in session_disconnect()
| * Don't clear saved account data in session_disconnect()Dmitry Podgorny2019-06-031-28/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If connection loss occurs, it calls session_disconnect() eventually. This function clears saved account data which is required for reconnection. Therefore, when reconnect timer expires, we get errors: 02/06/2019 04:53:42: stderr: ERR: (profanity:17115): GLib-CRITICAL **: 04:53:42.305: g_key_file_has_group: assertion 'group_name != NULL' failed 02/06/2019 04:53:43: prof: ERR: Unable to reconnect, account no longer exists: (null) To solve it, don't clear the saved data in session_disconnect(). It will be cleared properly on connection loss if reconnect timer is not configured. But won't be cleared with /disconnect command. So, after /disconnect the data will live in memory until the next /connect. Also, remove some copy-paste in connection loss path.
* | Merge pull request #1105 from profanity-im/autoping-timer-cancelMichael Vetter2019-06-034-8/+15
|\ \ | |/ |/| Cancel autoping timer on disconnect or connection loss
| * Cancel autoping timer on disconnect or connection lossDmitry Podgorny2019-06-034-8/+15
|/ | | | | | | | | If Profanity is disconnected in any way before ping response is received, the autoping timer will expire after the next connection is established. As result, user will be disconnected immediately. Cancel autoping timer in ev_disconnect_cleanup(), so it is done for all kind of disconnections.
* Merge pull request #1104 from profanity-im/fix-1103Michael Vetter2019-06-031-11/+28
|\ | | | | xmpp/connection: fix #1103
| * xmpp/connection: fix #1103Dmitry Podgorny2019-06-011-11/+28
|/ | | | | | | | | | | | When connection is lost, profanity tries to disconnect what leads to an infinite loop. The loop occurs, because connection_disconnet() runs xmpp_run_once() separately and waits for XMPP_CONN_DISCONNECT event. But it doesn't happen, because the connection object is disconnected. As solution, don't disconnect after XMPP_CONN_DISCONNECT is received. Also, don't free libstrophe objects while the event loops executes, because the event loop continues using objects after callbacks quit.
* Close windows on connection loss not general disc.Michael Vetter2019-05-272-1/+1
| | | | | | | | | | Call `ui_close_all_wins();` only if we disconnect on purpose not when connection is lost. Otherwise users might miss messages. This partly reverts 6ac73db876c83c7068c4795b19c09ea59eb18a40. Regards https://github.com/profanity-im/profanity/issues/1083
* Merge pull request #1092 from frnky/remove_mblenMichael Vetter2019-05-231-5/+2
|\ | | | | Don't call mblen() to not depend on locale
| * Don't call mblen() to not depend on localeFrank Zschockelt2019-05-221-5/+2
| | | | | | | | | | | | | | | | | | | | mblen will fail with return code -1 if the locale used by the unit tests isn't available on the machine. This will lead to an off by one error in some tests where the needle is at the end of the haystack. Since prof_occurrences expect null-terminated strings, the character after the needle can simply be found by incrementing the address of the found needle with strlen(needle).
* | Merge pull request #1102 from paulfariello/fix/malformed-omemo-messageMichael Vetter2019-05-231-4/+8
|\ \ | |/ |/| Correctly handle malformed OMEMO messages
| * Correctly handle malformed OMEMO messagesPaul Fariello2019-05-231-4/+8
|/ | | | Fix #1101
* Merge pull request #1098 from optmzr/fix-omemo-gen-messageMichael Vetter2019-05-221-0/+1
|\ | | | | | | | | Force UI update before generating OMEMO crypto materials The message wouldn't show up before the generation of OMEMO crypto materials started.
| * Force UI update before generating OMEMO crypto materialsWilliam Wennerström2019-05-211-0/+1
| |
* | Create seperate function for disconnect cleanupMichael Vetter2019-05-195-30/+115
| | | | | | | | | | Duplicate code in client_events.c and server_events.c. Let's have events/common.c and a function containing that code.
* | Merge pull request #1091 from frnky/fix_tests_on_32bitMichael Vetter2019-05-175-25/+25
|\ \ | |/ |/| Fix unit tests on 32-bit architectures
| * Use mock_type() for casting mock()Frank Zschockelt2019-05-084-13/+13
| |
| * Use mock_ptr_type() to silence compiler warningsFrank Zschockelt2019-05-084-12/+12
|/ | | | | | Unit tests on 32-bit architectures were failing due to "cast to pointer from integer of different size" warnings. mock_ptr_type silences those by first casting to uintptr_t.
* Fix ifdef guard (should have been OMEMO)Michael Vetter2019-05-061-1/+1
|
* Merge pull request #1090 from jubalh/fix/connection-loss-1089Michael Vetter2019-05-061-0/+5
|\ | | | | Reset things on connection loss
| * Reset things on connection lossMichael Vetter2019-05-061-0/+5
| | | | | | | | | | Remove the windows, clear tls certs, clean omemo. Regards https://github.com/profanity-im/profanity/issues/1089
* | Merge pull request #1084 from jubalh/occupants-charMichael Vetter2019-05-039-3/+94
|\ \ | |/ |/| Add occupants char
| * Add occupants charMichael Vetter2019-05-029-3/+94
| | | | | | | | | | | | | | `/occupants char` now sets a character that is displayed before the nick in MUCs. Similar like `/roster char` is displaying a char for the roster. Regards #690
* | Update travis URLMichael Vetter2019-05-031-1/+1
| |
* | Update profanity repo URLMichael Vetter2019-05-036-9/+9
| | | | | | | | Move from github.com/boothj5/* to github.com/profanity-im/*
* | Update tests with new URLMichael Vetter2019-05-037-40/+40
| | | | | | | | https://github.com/profanity-im/profanity/issues/1085
* | Update profanity URL in entity capabilities stanzaMichael Vetter2019-05-031-1/+1
| | | | | | | | Regards https://github.com/profanity-im/profanity/issues/1085
* | Update profanity URL in /tiny exampleMichael Vetter2019-05-031-1/+1
| | | | | | | | Regards https://github.com/profanity-im/profanity/issues/1085
* | Check for new profanity version using new URLMichael Vetter2019-05-032-2/+2
| | | | | | | | Regards https://github.com/profanity-im/profanity/issues/1085