aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code
5,192 Commits 31 Branches 59 Tags 24 MiB
5b4277840a
Commit Graph

5192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vetter
5b4277840a
Merge pull request #1104 from profanity-im/fix-1103 
xmpp/connection: fix #1103
 2019-06-03 11:00:08 +02:00
Dmitry Podgorny
c2d3c3e416 xmpp/connection: fix #1103 
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.
 2019-06-01 20:21:46 +03:00
Michael Vetter
bfa4a2ef1f Close windows on connection loss not general disc. 
Call `ui_close_all_wins();` only if we disconnect on purpose not when
connection is lost.

Otherwise users might miss messages.

This partly reverts 6ac73db876.
Regards https://github.com/profanity-im/profanity/issues/1083
 2019-05-27 12:52:04 +02:00
Michael Vetter
eb16c674ae
Merge pull request #1092 from frnky/remove_mblen 
Don't call mblen() to not depend on locale
 2019-05-23 21:18:46 +02:00
Michael Vetter
6c8acb1a95
Merge pull request #1102 from paulfariello/fix/malformed-omemo-message 
Correctly handle malformed OMEMO messages
 2019-05-23 13:54:52 +02:00
Paul Fariello
04cd1b4409 Correctly handle malformed OMEMO messages 
Fix #1101
 2019-05-23 13:12:02 +02:00
Frank Zschockelt
56e925ed03 Don't call mblen() to not depend on locale 
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).
 2019-05-22 19:57:52 +02:00
Michael Vetter
91d17edcb4
Merge pull request #1098 from optmzr/fix-omemo-gen-message 
Force UI update before generating OMEMO crypto materials

The message wouldn't show up before the generation of OMEMO crypto materials started.
 2019-05-22 09:52:29 +02:00
William Wennerström
e07a06d1a2
Force UI update before generating OMEMO crypto materials 2019-05-21 22:32:06 +02:00
Michael Vetter
883dbe1911 Create seperate function for disconnect cleanup 
Duplicate code in client_events.c and server_events.c. Let's have
events/common.c and a function containing that code.
 2019-05-19 22:57:51 +02:00
Michael Vetter
813949667c
Merge pull request #1091 from frnky/fix_tests_on_32bit 
Fix unit tests on 32-bit architectures
 2019-05-17 21:51:44 +02:00
Frank Zschockelt
4683395aca Use mock_type() for casting mock() 2019-05-08 21:52:16 +02:00
Frank Zschockelt
a5db791dc4 Use mock_ptr_type() to silence compiler warnings 
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.
 2019-05-08 21:51:29 +02:00
Michael Vetter
c94f3d0b4a Fix ifdef guard (should have been OMEMO) 2019-05-06 16:11:22 +02:00
Michael Vetter
9ecc14c95d
Merge pull request #1090 from jubalh/fix/connection-loss-1089 
Reset things on connection loss
 2019-05-06 16:06:41 +02:00
Michael Vetter
6ac73db876 Reset things on connection loss 
Remove the windows, clear tls certs, clean omemo.
Regards https://github.com/profanity-im/profanity/issues/1089
 2019-05-06 12:30:33 +02:00
Michael Vetter
4a165b81e6
Merge pull request #1084 from jubalh/occupants-char 
Add occupants char
 2019-05-03 11:11:40 +02:00
Michael Vetter
45ea73125f Update travis URL 2019-05-03 10:59:39 +02:00
Michael Vetter
d4892b29c4 Update profanity repo URL 
Move from github.com/boothj5/* to github.com/profanity-im/*
 2019-05-03 10:51:28 +02:00
Michael Vetter
a28f0d9e74 Update tests with new URL 
https://github.com/profanity-im/profanity/issues/1085
 2019-05-03 10:46:41 +02:00
Michael Vetter
ebbacec667 Update profanity URL in entity capabilities stanza 
Regards https://github.com/profanity-im/profanity/issues/1085
 2019-05-03 10:36:26 +02:00
Michael Vetter
9288621320 Update profanity URL in /tiny example 
Regards https://github.com/profanity-im/profanity/issues/1085
 2019-05-03 10:33:52 +02:00
Michael Vetter
1446ac15cb Check for new profanity version using new URL 
Regards https://github.com/profanity-im/profanity/issues/1085
 2019-05-03 10:33:46 +02:00
Michael Vetter
83433ee8e0 Update profanity URL in spec file 
Regards https://github.com/profanity-im/profanity/issues/1085
 2019-05-03 10:28:04 +02:00
Michael Vetter
6f59a57b68 Update profanity URL in manpage 
Regards https://github.com/profanity-im/profanity/issues/1085
 2019-05-03 10:27:13 +02:00
Michael Vetter
187a2a07cd Replace profanity URL in README 
Regards https://github.com/profanity-im/profanity/issues/1085
 2019-05-03 10:26:48 +02:00
Michael Vetter
f082563bf2 Add occupants char 
`/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
 2019-05-02 17:01:55 +02:00
Michael Vetter
722cb5fdc3 OMEMO: Initialize result in omemo_automatic_start 
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.
 2019-04-29 11:32:22 +02:00
Michael Vetter
9dd441aa39
Merge pull request #1080 from jubalh/omemo-no-device-id 
OMEMO: Check if ID is present before using it
 2019-04-24 15:51:08 +02:00
Michael Vetter
a794dadfa9 OMEMO: Check if ID is present before using it 
Fixes https://github.com/boothj5/profanity/issues/1079
 2019-04-24 15:20:54 +02:00
Michael Vetter
32a25179f3
Merge pull request #1078 from jubalh/statusbarnu 
Fix statusbar number in theme
 2019-04-24 14:50:16 +02:00
Michael Vetter
1d2c0ddc69 Fix statusbar number in theme 
There is a typo here. So this actually never worked ;-)
 2019-04-24 14:48:24 +02:00
Michael Vetter
01e13f98fd Add occupants.wrap to theme template 2019-04-24 10:50:01 +02:00
Michael Vetter
a666f0deae Fix formatting for privileges on 
`/privileges on` lists `Moderator`, `Visitor` etc. Formatting was wrong
here. Printing privilige followed by nickaname in the same line.
 2019-04-24 10:28:27 +02:00
Michael Vetter
30f9de61d0 Occupantswin: handle newline correctly 2019-04-24 09:49:14 +02:00
Michael Vetter
98f768bdc2 Add occupants wrap to help 2019-04-24 09:49:14 +02:00
Michael Vetter
259c5801cf Fix occupants header char message 2019-04-24 09:49:14 +02:00
Michael Vetter
125ca2f0d2 Add occupants wrap option 
Wrapping for the occupants panel like already exists for the roster
panel. See `/occupants wrap on`.

Regards https://github.com/boothj5/profanity/issues/690
 2019-04-24 09:49:14 +02:00
Michael Vetter
637dfca6dd
Merge pull request #1076 from kaffeekanne/update-copyright-years 
Update copyright years
 2019-04-24 09:30:15 +02:00
kaffeekanne
f8640019f3 Update copyright years 2019-04-24 01:08:38 +02:00
Michael Vetter
0d8a39d8dd Add occupantswin_occupants_all() stub to unittest 2019-04-23 14:47:42 +02:00
Michael Vetter
028839e35a Put occupants update into own function 2019-04-23 14:13:08 +02:00
Michael Vetter
566022786d Add occupants header char 
`/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
 2019-04-23 14:13:03 +02:00
Michael Vetter
82ddd88578
Merge pull request #1073 from kaffeekanne/fix-indention-time-config 
Fix indentation time confing
 2019-04-23 12:51:54 +02:00
kaffeekanne
49e2838a98 Fix indentation for time config 2019-04-23 12:39:05 +02:00
Michael Vetter
d520667935 Adjust jid for occupants indent 
Indent the jid one more space than nick.
 2019-04-20 20:35:45 +02:00
Michael Vetter
2b0e75ce35 Add occupants indent autocompletion 2019-04-20 20:35:45 +02:00
Michael Vetter
295cb0daa7 Add occupants.indent to theme_template 2019-04-20 20:35:45 +02:00
Michael Vetter
62c23233f7 Allow setting occupants indent outside of MUC 
And when not connected.
 2019-04-20 20:35:37 +02:00
Michael Vetter
0c248a0b16 Add /occupants indent command 
Roster has a `/roster contact indent` option.
Now we have the same for occupants. So contacts in roster and in MUC can
have configurable indentation.

Regards https://github.com/boothj5/profanity/issues/690
 2019-04-18 20:53:02 +02:00