about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #1410 from licaon-kter/patch-1Michael Vetter2020-07-221-1/+1
|\ | | | | Fix missed text in #1224
| * Fix missed text in #1224Licaon_Kter2020-07-221-1/+1
|/
* parser.c: Use helper function to reduce duplicate codeMichael Vetter2020-07-211-143/+50
| | | | | | | | | | `parse_args()` and `parse_args_with_freetext()` shared a lot of common code. Let's have a helper function `_parse_args_helper()` for that. The `with_freetext` parameter will make it behave like `parse_args_with_freetext()`. In preparation for https://github.com/profanity-im/profanity/issues/1404
* parse_args(): Call g_free() onceMichael Vetter2020-07-211-3/+2
|
* Use parse_args_with_freetext() for `/correct`Michael Vetter2020-07-202-3/+3
| | | | | | | | | | | | | This commit partly reverts 8f37afcd37ad8663ca36c13ca7fbc4a431119f73 Which was using a wrong approach to achieve this. It changed parse_args() to have a -1 for infinite parameters. But actually parse_args_with_freetext() should have been used exactly for this behaviour. Discovered when checking for https://github.com/profanity-im/profanity/issues/1404
* Merge pull request #1407 from wstrm/fix-arch-zstMichael Vetter2020-07-201-2/+8
|\ | | | | Change to .tar.zst archives that latest Arch devtools uses
| * Change to .tar.zst archives that latest Arch devtools usesWilliam Wennerström2020-07-201-2/+8
|/ | | | | This is required because of: https://www.archlinux.org/news/now-using-zstandard-instead-of-xz-for-package-compression/
* bookmark_ignore.c: use gchar instead of charMichael Vetter2020-07-201-7/+7
|
* Add filetype check to pre hook exampleMichael Vetter2020-07-151-1/+3
| | | | | | We have `Language: Cpp` in .clang-format but recently it tried to format my makefile anyways. Let's add this to be sure.
* Fix typo in commentMichael Vetter2020-07-151-1/+1
|
* Add comment to easily find where to put the next commandMichael Vetter2020-07-151-0/+2
|
* Format cmd_defsMichael Vetter2020-07-151-1942/+2037
| | | | | Format it more readable and disable clang for this part. Was messed up in 9b55f2dec0ea27a9ce4856e303425e12f866cea2.
* Remove `/tiny` commandMichael Vetter2020-07-106-217/+0
| | | | | | boothj5 gave his okay too. Fix https://github.com/profanity-im/profanity/issues/1370
* Merge pull request #1403 from wstrm/fix-error-no-freeMichael Vetter2020-07-101-0/+4
|\ | | | | Free errors after they have been printed
| * Free errors after they have been printedWilliam Wennerström2020-07-101-0/+4
| |
* | Merge pull request #1402 from wstrm/add-ubuntu-ciMichael Vetter2020-07-102-0/+54
|\ \ | | | | | | Ubuntu Latest (20.04 currently) in CI
| * | Ubuntu Latest (20.04 currently) in CIWilliam Wennerström2020-07-102-0/+54
| |/
* | Add forgotten file..Michael Vetter2020-07-101-2/+2
| | | | | | | | Belongs to 95ab7ee062b9fbeea73b90f69c6fef3325f880c9
* | Setting: only write in console upon muc mentionMichael Vetter2020-07-104-5/+16
|/ | | | | | `/console muc mention` additionally to `first|none|all`. Fix https://github.com/profanity-im/profanity/issues/1371
* Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-1010-75/+148
|\
| * Merge pull request #1400 from profanity-im/feature/1399-console-hilightMichael Vetter2020-07-0910-75/+148
| |\ | | | | | | Dont hilight console once all messages have been read
| | * Adapt unittestsMichael Vetter2020-07-091-3/+16
| | |
| | * Pass window to functions so we dont have to call twiceMichael Vetter2020-07-095-18/+17
| | |
| | * Dont hilight console once all messages have been readMichael Vetter2020-07-097-63/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we receive a message we get: << room message: eagle@conference.anoxinon.me (win 2) Same for private chats and regular chats. And several other kinds of notifications. If we only receive notifications from a chat window it would be nice to also clear the hilight on the console window since we already catched up by reading the actual message in the chat window. Probably not the best description :-) I hope you get it.. Regards https://github.com/profanity-im/profanity/issues/1399
* | | Merge branch 'feature/ox-discover'Michael Vetter2020-07-107-13/+308
|\ \ \ | |/ / |/| | | | | | | | Patch sent by DebXWoody by mail under: `[PATCH] OX: Discovering Public Keys via PEP`
| * | ox review: Use english not germanMichael Vetter2020-07-101-5/+5
| | |
| * | OX: XEP-0373: OpenPGP for XMPP - Version 0.5.0 (2020-06-19)DebXWoody2020-07-107-13/+308
|/ / | | | | | | | | | | | | | | | | | | | | Discovering Public Keys via PEP * 4.3 Discovering Public Keys of a User * 4.4 Requesting Public Keys * Import Public Keys into GnuPG's local keyring. Issue: #1331
* / Mention profnaity_version in release guideMichael Vetter2020-07-091-0/+1
|/
* Make _show_roster_contacts staticMichael Vetter2020-07-091-2/+2
|
* ci os tw: disable building of stabberMichael Vetter2020-07-081-7/+7
| | | | | | | | | | | | | | libmicrohttpd 0.97.1 changed some types. These commits adapt stabber: https://github.com/profanity-im/stabber/commit/f33c4b6ba9281d1e5ff7c488cc0df00e331c98ba https://github.com/profanity-im/stabber/commit/81f38c6a3377e2a1df3bfbb223f98bdaf3fd8ffa Tumbleweed does not yet have the latest libmicrohttpd in its repositories. But it is updated in the devel repo. So should land there in the next couple of days. Let's disable building stabber on TW for that time.
* readme: add link to contributing.mdMichael Vetter2020-07-071-0/+1
|
* Apply coding styleMichael Vetter2020-07-07213-17154/+19156
|
* clang-format: Dont sort includesMichael Vetter2020-07-071-0/+1
|
* OX: Fix testsMichael Vetter2020-07-071-1/+2
| | | | | | | | Fix: ``` /usr/bin/ld: src/xmpp/ox.o: in function `ox_announce_public_key': src/xmpp/ox.c:90: undefined reference to `p_ox_gpg_readkey' ```
* Revert "Apply coding style"Michael Vetter2020-07-07214-19638/+17648
| | | | | | This reverts commit 9b55f2dec0ea27a9ce4856e303425e12f866cea2. Sorting the includes creates some problems.
* Merge pull request #1397 from wstrm/doc-pre-push-hookMichael Vetter2020-07-071-1/+17
|\ | | | | Tip about pre-push hook in contribution guidelines
| * Add highlightingWilliam Wennerström2020-07-071-2/+2
| |
| * Tip about pre-push hook in contribution guidelinesWilliam Wennerström2020-07-071-0/+16
|/
* Add pre-commit hook clang-format exampleMichael Vetter2020-07-071-0/+11
| | | | Regards https://github.com/profanity-im/profanity/issues/1396
* Apply coding styleMichael Vetter2020-07-07214-17648/+19638
| | | | Regards https://github.com/profanity-im/profanity/issues/1396
* Add clang-format fileMichael Vetter2020-07-073-0/+48
| | | | | People should run `make format` before doing a commit. Fix https://github.com/profanity-im/profanity/issues/1396
* Tests: Add ox_announce_public_key stubMichael Vetter2020-07-062-0/+10
|
* OX: Announce public key on PEPDebXWoody2020-07-067-2/+396
| | | | | | | | | | | | | | | src/pgp/gpg.c:p_ox_gpg_readkey Used to read a public key from a file. The function will return the fingerprint of the file and the base64 encoded key. src/xmpp/ox.[hc] ox_announce_public_key(const char* const filename) can be called from the /ox announce <filename> command. The key within the file will be pushed on PEP and the Metadata node will be set. Issue: #1331
* Merge pull request #1394 from wstrm/fix-log-errors-call-externalMichael Vetter2020-07-061-1/+2
|\ | | | | Log errors from eval_password
| * Log errors from eval_passwordWilliam Wennerström2020-07-061-1/+2
|/ | | | | All errors were discarded to /dev/null if the error_ptr was set to NULL.
* Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-062-4/+5
|\
| * Merge pull request #1386 from DebXWoody/masterMichael Vetter2020-07-062-4/+5
| |\ | | | | | | Rework logging
| | * Rework loggingStefan Kropp2020-07-032-4/+5
| | | | | | | | | | | | | | | | | | Changed default logging from INFO to WARN. Issue: #1353
* | | Plain chat messages not workingDebXWoody2020-07-061-4/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plain chat messages not working for non-carbon + no OTR support. On master we did some clean-up. The problem is at https://github.com/profanity-im/profanity/blob/0.9.patch/src/event/server_events.c#L625 (0.9.0). The implementation looks like: - HAVE_LIBOTR is set - _sv_ev_incoming_otr - HAVE_LIBOTR is not set - _sv_ev_incoming_plain I think the `_sv_ev_incoming_otr` can handle otr and plain, because I didn't find a `_sv_ev_incoming_plain` if `HAVE_LIBOTR` is set. On master for 0.10.0 the implementation is much better: https://github.com/profanity-im/profanity/blob/master/src/event/server_events.c#L623 But, we just call `_sv_ev_incoming_otr` independent of `HAVE_LIBOTR`. Unfortunately, `_sv_ev_incoming_otr` is doing nothing if `HAVE_LIBOTR` is not set: https://github.com/profanity-im/profanity/blob/master/src/event/server_events.c#L538 I did some more clean-up at sv_ev_incoming_message and changed the implementation of `_sv_ev_incoming_otr`. ``` static void _sv_ev_incoming_otr(ProfChatWin *chatwin, gboolean new_win, ProfMessage *message) { // OTR or plain plain } ``` The caller do not take care of `HAVE_LIBOTR`, call `_sv_ev_incoming_plain` if you are sure it's a plain message or call `_sv_ev_incoming_otr`. `_sv_ev_incoming_otr` can be used for otr / plain or for plain only.
* | Merge branch 'master' of github.com:profanity-im/profanityMichael Vetter2020-07-041-11/+13
|\ \
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-08-05 06:17:50 +0000