1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

255 Commits

Author SHA1 Message Date
James Booth
9aff8abd2e Merge branch 'master' into openpgp
Conflicts:
	.travis.yml
2015-06-05 23:02:56 +01:00
James Booth
78a4446023 Merge branch 'master' into stabber-tests 2015-06-02 20:32:15 +01:00
James Booth
a3693cfbe7 Merge branch 'master' into openpgp 2015-06-02 20:32:07 +01:00
Pete
2ce35fe61c Added Theme UI option for window auto tidy 2015-06-01 11:44:52 +01:00
Will Song
9463c67190
fix conflicts 2015-05-29 19:53:37 -05:00
Pete
fbc57765a3 Added window auto tidy. 2015-05-29 14:25:14 +01:00
James Booth
2c5b44421e Added initial stabber test 2015-05-17 22:05:43 +01:00
James Booth
3fd9692aec Merge branch 'master' into pgp 2015-05-04 23:40:58 +01:00
James Booth
4ba33005d0 Use null check convention in theme.c 2015-05-04 22:33:55 +01:00
James Booth
b093b99c15 Use null check convention in preferences.c 2015-05-04 22:33:19 +01:00
James Booth
a293045d85 Use null check convention in accounts.c 2015-05-04 22:32:42 +01:00
James Booth
47549452f1 Use null check convention in account.c 2015-05-04 22:29:51 +01:00
James Booth
7a44e17141 Merge branch 'master' into pgp
Conflicts:
	src/config/account.h
2015-04-23 23:48:43 +01:00
James Booth
bc9e6b79cd Tidied account login 2015-04-23 21:56:48 +01:00
James Booth
bcfbbac49a Merge branch 'master' into pgp 2015-04-12 02:16:13 +01:00
James Booth
57dc5f14ef Added option to show jids in occupants panel 2015-04-12 02:14:37 +01:00
James Booth
475dfebd97 Added pgpkeyid account setting, send signed presence 2015-03-23 23:38:06 +00:00
James Booth
f1f047889e Added individual options to send and request delivery receipts 2015-03-19 22:57:51 +00:00
James Booth
b21edfaa51 Added receipt.sent theme setting 2015-03-15 19:35:25 +00:00
James Booth
78becceedb Added basic delivery receipts 2015-03-11 23:18:28 +00:00
James Booth
e5bb12a0d6 Added /time statusbar preference 2015-03-10 23:35:08 +00:00
James Booth
945f29873e Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280 2015-03-08 21:51:50 +00:00
James Booth
22daac5fe9 Upgrade otr warn preference, added UI theme settings 2015-02-25 00:01:41 +00:00
James Booth
68a8ab3401 Updated default preferences 2015-02-24 22:53:57 +00:00
Christian Storm
a1d14c4526 Fixed spelling. 2015-02-17 10:52:37 +01:00
James Booth
421ce2876a Changed default inpblock delay to 1 second 2015-02-10 23:40:23 +00:00
James Booth
b3be26a214 Updated copyright 2015-02-10 23:16:09 +00:00
Olivier LE MOAL
48f9f3b3b0 Add XEP-0280 support 2015-02-10 11:32:22 +01:00
James Booth
6682f243ce Free theme list after use 2015-02-09 21:21:22 +00:00
James Booth
351ff752a7 Renamed command group presence->presences to avoid clash 2015-01-28 20:35:00 +00:00
Will Song
7f436d614b
use custom format string for time preference 2015-01-27 19:55:16 -06:00
James Booth
4c6cfcdca0 Simplified autocompleters and command history 2015-01-16 22:50:40 +00:00
Will Song
c2758616d8
eval_password code is now in cmd_connect so that it can be changed
without clearing it. eval_password errors are also now ignored, along
with pclosing the popened eval_password.
2015-01-12 22:23:36 -06:00
James Booth
a932998fb1 Removed unused include, free eval_password 2015-01-13 00:43:17 +00:00
James Booth
21f8b1c4ca Merge remote-tracking branch 'peterlvilim/keyring' 2015-01-13 00:41:56 +00:00
Simon Effenberg
34148e2101 adding preference option for dynamic input blocking
/inpblock is now having subcommands 'timeout' and 'dynamic'
with:

/inpblock timeout <milliseconds>

and

/inpblock dynamic <on|off>

Defaults are:

/inpblock timeout 500
/inpblock dynamic on

To get the old behavior specify:

/inpblock timeout 20
/inpblock dynamic off

The dynamic mode will block incrementally after something
should be written to the window or after a key was pressed. So pressing
a key would set the timeout to 0ms and after 10 timeouts to the next
bigger one.

Example (with dynamic mode on):

"/inpblock timeout 50"

timeout series:

10x 0ms
10x 10ms (0ms + 10 times since last keypress)
10x 30ms (10ms + 20 times since last keypress)
*x50ms until next key was pressed or
2015-01-12 11:32:32 +01:00
James Booth
0d0ed9b7ca Merge remote-tracking branch 'incertia/exit-title'
Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
2015-01-12 01:12:42 +00:00
James Booth
c64484c6ed Renamed titlebar preference 2015-01-12 00:43:42 +00:00
James Booth
7256e49396 Merge branch 'master' into chat-sessions 2015-01-10 19:23:59 +00:00
James Booth
c77a731cf0 Added comments to preferences module 2015-01-10 19:22:38 +00:00
James Booth
31c0f2ba78 Added preferences for showing resource in titlebar and messages 2015-01-10 19:10:10 +00:00
Will Song
e57fa1633a add exit title preference to group and add command for setting the preference 2015-01-08 10:18:29 -06:00
Will Song
f1641f3cf7
add exit title preference 2015-01-08 10:02:30 -06:00
Peter Vilim
0cb548683c fgets: buffer size 2015-01-07 21:37:35 -06:00
Peter Vilim
b298994ce7 fix for fgets 2015-01-07 21:16:18 -06:00
Peter Vilim
887cc1f419 merge 2015-01-07 21:07:32 -06:00
Peter Vilim
492c548aa6 Add support for evaluated password 2015-01-07 02:54:42 -06:00
Peter Vilim
b4f37b9e31 iofixed 2015-01-07 00:17:59 -06:00
Peter Vilim
401835f32a Add support for evaluated password 2015-01-06 23:00:02 -06:00
James Booth
d572474fed Default title bar update to false 2014-12-31 01:50:16 +00:00
James Booth
aebee209b2 Merge remote-tracking branch 'incertia/connect-default'
Conflicts:
	CHANGELOG
2014-12-29 15:29:28 +00:00
James Booth
9d94ac5c63 Removed function pointers 2014-12-22 22:13:42 +00:00
James Booth
13f73a30e7 Added /inpblock command 2014-12-21 18:15:29 +00:00
James Booth
5875dcfd53 Only overwrite preferences with theme when them loaded, not on startup 2014-11-30 21:25:13 +00:00
Will Song
de9e621bb7 add default account property and commands associated with them 2014-11-27 11:42:23 -06:00
James Booth
679513ae73 Merge remote-tracking branch 'incertia/account-remove' 2014-11-24 00:38:22 +00:00
James Booth
05664ef009 Free string after setting theme ui preference, fixed valgrind warning 2014-11-24 00:29:02 +00:00
Will Song
be031bbe54 implement account removal 2014-11-23 15:53:13 -06:00
James Booth
20fa96325d Added [ui] preferences to themes 2014-11-19 23:58:55 +00:00
James Booth
1a896d7b53 Tidied theme.c 2014-11-19 16:53:40 +00:00
James Booth
1d5ac1b474 Added /theme colours command 2014-11-17 21:10:08 +00:00
James Booth
74d9937573 Changed type to enum for presence colour attributes 2014-11-16 23:37:07 +00:00
James Booth
976e5aac0a Added support for bold theme settings 2014-11-16 21:56:19 +00:00
James Booth
ed4391ec8a Replaced colours with theme_item_t 2014-11-16 20:40:19 +00:00
James Booth
40dc8e2c49 Added /time setting 2014-11-16 00:40:54 +00:00
James Booth
1479a5e134 Added /roster size and /occupants size settings 2014-11-15 23:47:27 +00:00
James Booth
497b07c1c3 Added /roster show|hide command, only show roster on connect success 2014-11-10 23:23:02 +00:00
James Booth
46583839df Added /wrap user preference for enabling/disabling word wrapping 2014-11-09 23:29:25 +00:00
James Booth
373b3a2d7c Added /presence command to show contacts presence 2014-11-07 22:38:34 +00:00
James Booth
f56cc9761f Added main.text.me and main.text.them theme settings 2014-11-07 20:46:31 +00:00
James Booth
d7911664e1 Merge branch 'master' into symlinks 2014-10-26 20:53:33 +00:00
James Booth
be7c4f5a00 Follow symlinks for profrc and accounts files 2014-10-26 20:43:05 +00:00
James Booth
84765969e0 Added /account clear [account] port 2014-10-23 23:12:15 +01:00
James Booth
552d88b931 Added /account clear [account] server 2014-10-23 23:07:27 +01:00
James Booth
c6ae459cd5 Set file permissions for preferences file 2014-10-18 21:26:38 +01:00
James Booth
462cf67f1d Set file permissions for accounts file 2014-10-18 21:23:42 +01:00
James Booth
fc049c9eef Added /privileges command to set UI option for showing roles/affiliations in rooms 2014-10-18 20:22:34 +01:00
James Booth
ce7cb3f40f Added occupants UI preference 2014-10-09 22:02:39 +01:00
James Booth
f9737251a6 Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
James Booth
8fc4249228 Enable splash logo by default 2014-08-09 19:00:59 +01:00
James Booth
816351d371 Set auto reconnect to 30 seconds by default
fixes #386
2014-07-29 15:40:51 +01:00
James Booth
4624eabb75 Colour chat room messages that contain users nickname 2014-07-16 13:44:16 +01:00
James Booth
954661e59e Added quote param to autocomplete_complete 2014-07-09 20:23:47 +01:00
James Booth
d668d15081 Free aliases on cmd_init 2014-06-18 21:36:09 +01:00
James Booth
7344d3b898 Added deallocation function for string prefs, added otr policy enum 2014-06-18 00:32:36 +01:00
James Booth
4a485a64f9 Free account_name preference on autoconnect 2014-06-17 22:22:35 +01:00
James Booth
2f95340c3a Free GError on prefs load 2014-06-17 21:02:48 +01:00
James Booth
e296379863 Fixed memleak when writing preferences file 2014-06-15 17:19:56 +01:00
James Booth
b36fbe413a Added settings to show message text in notifications 2014-05-24 22:14:26 +01:00
James Booth
b25b3f3180 Added notification setting for typing in current window 2014-05-24 21:13:33 +01:00
James Booth
eb0f0dd96b Added settings for message notifications in current window 2014-05-24 20:46:03 +01:00
James Booth
866d87af79 Added /notify room mention setting 2014-05-24 16:46:05 +01:00
James Booth
7d90d218c0 Split regular and chat room notify settings 2014-05-24 15:54:10 +01:00
James Booth
b3d49f2a3c Added backwards compatible g_list_free_full for glib < 2.28 2014-05-21 21:39:31 +01:00
James Booth
9dda7036a9 Implemented per contact OTR policy setting 2014-05-11 19:32:07 +01:00
James Booth
6d955609c5 Added /otr policy for contacts in account preferences 2014-05-11 18:13:04 +01:00
James Booth
3967b26aea Added otr to /account clear properties 2014-05-11 15:32:38 +01:00
James Booth
95ff13136b Added OTR policy account preference 2014-05-11 14:13:15 +01:00
James Booth
ddbb4872b3 Moved global OTR settings to [otr] group 2014-05-11 13:13:25 +01:00
James Booth
d6e92f62dc Fixed cppcheck warnings 2014-04-26 00:36:36 +01:00
James Booth
1a0f12b0e6 Merge remote-tracking branch 'lucian/master' 2014-04-22 23:53:15 +01:00
lightb
a687e3f6b4 Added /otr policy to commands (still need to add autocomplete stuff?) 2014-04-19 04:18:53 -04:00
lightb
02b77cfa4e Added PREF_OTR_POLICY to preferences.c -> key -> otr.policy
Added default value "manual" to PREF_OTR_POLICy -> preferences.c
Modified help string to reflect otr_policy, started checks on cmd_otr
2014-04-19 04:00:41 -04:00
lightb
3303376b42 Added PREF_OTR_POLICY - should be default global policy and set to MANUAL 2014-04-19 03:12:22 -04:00
James Booth
df345a2cfb Merge remote-tracking branch 'pasis/iss323' 2014-04-18 21:41:05 +01:00
James Booth
c3418a2909 Added /log shared setting
Issue #170
2014-04-13 21:56:51 +01:00
James Booth
a4a23fdf68 Added /log rotate option 2014-04-13 20:41:11 +01:00
Dmitry Podgorny
aa6e2284fc config/theme: search for system-wide themes
Search for system-wide themes (usually /usr/share/profanity/themes) if
not found in user's home directory.

Not tested yet.
2014-04-09 21:42:14 +03:00
James Booth
561d96c711 Removed titlebar version property and allow disabling of titlebar display 2014-04-03 21:46:43 +01:00
James Booth
2af418fd8d Command '/statuses muc' now allows 'all', 'online' and 'none' settings 2014-03-15 22:25:15 +00:00
James Booth
26726b207a Updated copyright 2014-03-09 01:18:19 +00:00
James Booth
e089ffb15c Show message when alias already exists in /alias add 2014-01-23 22:38:12 +00:00
James Booth
8dbe300d72 Added /alias command, writing aliases to [alias] group in profrc 2014-01-23 22:29:53 +00:00
James Booth
21ab182151 Refactored ProfAccount creation 2014-01-22 22:22:01 +00:00
James Booth
a7a2850637 WIP - /statuses command options 2014-01-20 18:40:48 +00:00
James Booth
69f2f4a16f Use defaults for /statuses commands 2014-01-19 17:20:31 +00:00
James Booth
79e9ab83b0 Changed /statuses preferences 2014-01-19 16:17:34 +00:00
James Booth
39e0782da8 Fixed test compilation 2014-01-18 20:34:46 +00:00
James Booth
e7013408e5 WIP - Adding port to account options 2014-01-18 01:45:05 +00:00
James Booth
b1de8a4005 Added OTR remaining system messages and colouring 2014-01-17 00:06:08 +00:00
James Booth
4f98bc8c25 Show OTR coloured status
Customisable within theme files e.g.:
titlebar.unencrypted=red
titlebar.encrypted=green
titlebar.trusted=red
titlebar.untrusted=green

Shows [unencrypted] for all non-OTR chat

Disable with '/otr warn off'
2014-01-16 22:44:23 +00:00
James Booth
60820007ee Added setting /otr log on|off|redact 2014-01-13 20:17:45 +00:00
James Booth
8685e78c86 Added mock_accounts and fixed tests 2013-12-26 13:37:22 +00:00
James Booth
5e739cbfb7 Moved fulljid logic to accounts 2013-12-15 20:32:30 +00:00
James Booth
1c2661f1c3 Added clear command to /account for password clearing
fixes #267
2013-12-08 23:36:00 +00:00
James Booth
be653667e4 Added /account set <account> password <password> 2013-11-07 23:36:04 +00:00
James Booth
2b0108e6cc Allow "account" setting in [connection] to autconnect the account
closes #251
2013-11-07 23:04:12 +00:00
James Booth
2fa8da493e Use correct type in account rename for priorities
fixes #250
2013-11-07 22:20:30 +00:00
James Booth
99d3322834 Added MAX_PASSWORD_SIZE set to 64
fixes #245
2013-11-07 22:15:43 +00:00
James Booth
4abdb02396 Merge remote-tracking branch 'tsenart/passwords-on-accounts-file' 2013-11-07 21:43:11 +00:00
Tomás Senart
480589f0ae Use passwords from the accounts file
This commit makes it so that if the password in an account in the
accounts file is present, then use it. Otherwise ask for the password to
the user.
2013-10-14 20:15:51 +02:00
James Booth
e7159aca30 Fixed memory leak in accounts_get_account
issue #226
2013-09-23 00:09:20 +01:00
James Booth
e3e1341c9a Fixed memory leak in accounts_get_account
issue #226
2013-09-23 00:08:50 +01:00
James Booth
df14a46d48 Allow users to set default muc service and nickname per account
See #238

Conflicts:

	src/config/accounts.c
2013-09-12 23:34:30 +01:00
Dmitry Podgorny
545a23e92f removed strdup in autocomplete calls 2013-08-26 03:29:50 +03:00
Dmitry Podgorny
b1bfdf650a fixed memory leaks in various files 2013-08-25 14:54:34 +03:00
Dmitry Podgorny
0346fda0b3 most FREE_SET_NULL replaced with free
FREE_SET_NULL makes extra assignment of NULL for pointers in stack or
dynamic memory that is going to be freed.
FREE_SET_NULL is useful for pointers that can be used in future.
2013-08-03 14:27:07 +03:00
James Booth
581c1e8b95 Coloured contact and subscription in /roster and /group output 2013-07-03 23:44:51 +01:00
James Booth
4d9148e734 Added rooms history to ProfAccount 2013-05-23 22:29:41 +01:00
James Booth
8c5866ff52 Added groupchat logs
closes #168
2013-05-05 00:16:10 +01:00
James Booth
441422ddc8 Added desktop notification option for subscription requests
closes #166
2013-04-27 23:46:49 +01:00
James Booth
f099bf9a7c Added desktop notifications for chat room invites
Use "/notify invite on|off"
2013-04-22 23:48:23 +01:00
James Booth
608c09c90d Mouse handling disabled by default. 2013-03-19 20:05:56 +00:00
James Booth
e922568770 Added resource_presence_t and contact_presence_t 2013-02-10 17:13:19 +00:00
James Booth
591f8a8dbf Renamed jabber_presence_t->presence_t 2013-02-10 11:31:31 +00:00
James Booth
2cea263917 Added asserts 2013-02-03 23:46:20 +00:00
James Booth
1cea320a0c Send entity capabilities and status when joining room 2013-02-03 20:09:56 +00:00
James Booth
069bdbc331 Refactored string preferences 2013-02-03 03:24:13 +00:00
James Booth
7982b8e413 Refactored setting boolean preferences 2013-02-03 02:51:15 +00:00
James Booth
ca26452af6 Refactored getting boolean preferences 2013-02-03 02:35:04 +00:00