about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Update profanity URL in spec fileMichael Vetter2019-05-031-1/+1
| | | | | | | | Regards https://github.com/profanity-im/profanity/issues/1085
* | Update profanity URL in manpageMichael Vetter2019-05-031-3/+3
| | | | | | | | Regards https://github.com/profanity-im/profanity/issues/1085
* | Replace profanity URL in READMEMichael Vetter2019-05-031-3/+3
|/ | | | Regards https://github.com/profanity-im/profanity/issues/1085
* OMEMO: Initialize result in omemo_automatic_startMichael Vetter2019-04-291-1/+1
| | | | | | | | | This is actually not needed because result will always be set. hartmann had problems building profanity on OpenBSD and he proposed this patch. Let's use it to make the compiler happy there.
* Merge pull request #1080 from jubalh/omemo-no-device-idMichael Vetter2019-04-241-1/+5
|\ | | | | OMEMO: Check if ID is present before using it
| * OMEMO: Check if ID is present before using itMichael Vetter2019-04-241-1/+5
|/ | | | Fixes https://github.com/boothj5/profanity/issues/1079
* Merge pull request #1078 from jubalh/statusbarnuMichael Vetter2019-04-241-1/+1
|\ | | | | Fix statusbar number in theme
| * Fix statusbar number in themeMichael Vetter2019-04-241-1/+1
|/ | | | There is a typo here. So this actually never worked ;-)
* Add occupants.wrap to theme templateMichael Vetter2019-04-241-0/+1
|
* Fix formatting for privileges onMichael Vetter2019-04-241-0/+4
| | | | | `/privileges on` lists `Moderator`, `Visitor` etc. Formatting was wrong here. Printing privilige followed by nickaname in the same line.
* Occupantswin: handle newline correctlyMichael Vetter2019-04-241-6/+6
|
* Add occupants wrap to helpMichael Vetter2019-04-241-2/+4
|
* Fix occupants header char messageMichael Vetter2019-04-241-2/+2
|
* Add occupants wrap optionMichael Vetter2019-04-247-2/+33
| | | | | | | Wrapping for the occupants panel like already exists for the roster panel. See `/occupants wrap on`. Regards https://github.com/boothj5/profanity/issues/690
* Merge pull request #1076 from kaffeekanne/update-copyright-yearsMichael Vetter2019-04-243-4/+4
|\ | | | | Update copyright years
| * Update copyright yearskaffeekanne2019-04-243-4/+4
|/
* Add occupantswin_occupants_all() stub to unittestMichael Vetter2019-04-231-0/+1
|
* Put occupants update into own functionMichael Vetter2019-04-233-34/+21
|
* Add occupants header charMichael Vetter2019-04-239-6/+155
| | | | | | | | `/occupants header char` now sets a character that is displayed before the role (moderator, visitor..) in a room. Similar to `/roster header char` is displaying a char for the roster. Regards https://github.com/boothj5/profanity/issues/690
* Merge pull request #1073 from kaffeekanne/fix-indention-time-configMichael Vetter2019-04-231-2/+2
|\ | | | | Fix indentation time confing
| * Fix indentation for time configkaffeekanne2019-04-231-2/+2
|/
* Adjust jid for occupants indentMichael Vetter2019-04-201-3/+11
| | | | Indent the jid one more space than nick.
* Add occupants indent autocompletionMichael Vetter2019-04-201-0/+1
|
* Add occupants.indent to theme_templateMichael Vetter2019-04-201-0/+1
|
* Allow setting occupants indent outside of MUCMichael Vetter2019-04-202-34/+31
| | | | And when not connected.