James Booth
91e0fd8af1
Merge branch 'master' into plugins
2014-04-26 00:37:37 +01:00
James Booth
5f11c2180d
Merge remote-tracking branch 'origin/master'
2014-04-26 00:37:06 +01:00
James Booth
d6e92f62dc
Fixed cppcheck warnings
2014-04-26 00:36:36 +01:00
James Booth
2e4af77b85
Removed debian folder
...
Related to issue #338 which involved creating a supported debian package
2014-04-25 12:52:29 +01:00
James Booth
3c00b1e451
Merge branch 'master' into plugins
2014-04-25 00:04:39 +01:00
James Booth
ab4ea80a70
Added open xml console
2014-04-25 00:04:01 +01:00
James Booth
cb4deb18bb
Merge branch 'master' into plugins
2014-04-24 23:09:58 +01:00
James Booth
f8b2e009ed
Fixed /wins swap help
2014-04-24 23:09:04 +01:00
James Booth
e9ddbab585
Allow /wins swap to move to empty position
2014-04-24 23:06:42 +01:00
James Booth
547b6cf4da
Added command /wins swap
2014-04-24 21:50:59 +01:00
James Booth
677fe16df0
Merge branch 'master' into plugins
...
Conflicts:
src/command/command.c
src/command/commands.c
src/server_events.c
2014-04-23 23:01:58 +01:00
James Booth
034a98587c
Added -a (--account) option to man page
2014-04-23 22:43:05 +01:00
James Booth
c7b3ff02ff
Rejoin private rooms after reconnecting
2014-04-23 22:19:14 +01:00
James Booth
4384a1f468
Tidied jabber_process_events
2014-04-23 20:51:57 +01:00
James Booth
1706980fd7
Merge remote-tracking branch 'lucian/master'
...
Conflicts:
src/server_events.c
2014-04-23 00:20:34 +01:00
James Booth
4d8caee483
Added /otr policy autocompletion
2014-04-23 00:01:18 +01:00
lightb
e08ee67f5f
Bugfix: Because whitespace was removed, last check OTR always, didn't work, now it works.
2014-04-22 18:53:48 -04:00
James Booth
1a0f12b0e6
Merge remote-tracking branch 'lucian/master'
2014-04-22 23:53:15 +01:00
lightb
5a5ad31edf
Added new functionality to OTR always policy
...
If policy is set to always, and unencrypted message is received it will try to start an otr session.
Note: Fully tested with pidgin, is now working (opportunistic and always)
2014-04-22 18:07:53 -04:00
lightb
1192e67cf7
Strip whitespace from otr tagged message for proper display.
...
Will handle BASE + OTRV1TAG/OTRV2TAG or BASE + OTRV1TAG + OTRV2TAG
or BASE + OTRV2TAG + OTRV1TAG
2014-04-22 16:55:28 -04:00
lightb
1bd617d389
Small modification, should check for whitespace pattern even if policy is always.
2014-04-22 16:26:45 -04:00
lightb
6450e2a704
Added OTR opportunistic pattern intercept.
...
When a message is received, OTRL_MESSAGE_TAG_BASE + OTRL_MESSAGE_TAG_V1 or OTRL_MESSAGE_TAG_V2
is searched for, if it is, the client attempts to start an OTR session.
Tested between profanity clients: WORKED
Tested between profanity and pidgin: NOT WORKING (not sure if pidgin checks for the whitespace)
2014-04-22 16:01:57 -04:00
lightb
f95ae8b0dd
Modified otrlibv4 and otrlibv4 to add informative message when starting OTR conversation.
2014-04-22 13:07:19 -04:00
lightb
36c6dbda86
Compilation v4 fix
2014-04-21 18:08:38 -04:00
lightb
da89e24172
Added opportunistic send functionality to cmd_msg
...
If policy is set to 'opportunistic' then when the user executes cmd_msg it will append the otr whitespace tag to the message
The other client should start AKE once it receives the message.
TODO: Analyze incoming messages for whitespace tag
2014-04-21 18:03:07 -04:00
James Booth
94cd4723be
Merge branch 'master' into plugins
...
Conflicts:
Makefile.am
configure.ac
src/ui/titlebar.c
2014-04-21 00:50:54 +01:00
James Booth
2c15aba92a
Chat room windows now created only after successful join
2014-04-21 00:37:04 +01:00
James Booth
9a55d8ad19
Store password with room
2014-04-20 22:02:55 +01:00
lightb
1ceca89296
Added some otr policy functionality, if policy is set to "always"
...
if otr_is_secure fails, the message will not be sent.
Changed both cmd_msg and cmd_execute_default
2014-04-19 05:08:33 -04: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
e830e2a06a
Show message in console when contact starts OTR session
2014-04-19 00:56:57 +01:00
James Booth
71aea78e90
Open new window when otr session started by contact
...
fixes #331
2014-04-19 00:03:36 +01:00
James Booth
8f2c0a66bf
Handle subscription on otr message sends
2014-04-18 23:40:35 +01:00
James Booth
fadad0aeba
OTR end messages are now send to recipients not in the roster.
...
fixes #333
2014-04-18 23:29:22 +01:00
James Booth
2451b7b1ca
Fixed makefile to include headers in test sources
2014-04-18 21:47:33 +01:00
James Booth
df345a2cfb
Merge remote-tracking branch 'pasis/iss323'
2014-04-18 21:41:05 +01:00
Dmitry Podgorny
0c1092fd30
autotools: added EXTRA_DIST
...
Now sources can be distributed with `make dist-bzip2` command, so no
need to make tarball manually. Current patch takes into account the
status (release or development) and puts .git/HEAD, .git/index to
tarball if necessary.
Unfortunately, current scripts don't add any information about
development status to the version string. Therefore,
profanity-0.5.0.tar.bz2 is got regardless of development or release
status.
2014-04-17 12:35:09 +03:00
James Booth
d3a23d42e4
Fixed compile error when using libotr 4.0.0
2014-04-16 20:52:14 +01:00
James Booth
00fd7f4bce
Merge branch 'master' into plugins
...
Conflicts:
src/ui/window.h
src/ui/windows.c
2014-04-15 23:48:59 +01:00
James Booth
ef776e52ca
Tidied xmlconsole
2014-04-15 23:45:17 +01:00
James Booth
e6e0a13e89
Added XML Console window
2014-04-15 13:16:32 +01:00
James Booth
bf185d9907
Added simple stanza logging to main console
2014-04-15 01:08:41 +01:00
James Booth
532e81a301
Merge branch 'master' into plugins
2014-04-15 00:28:59 +01:00
James Booth
40759eddbf
Simplified parse_options to take first option as argument
2014-04-15 00:27:55 +01:00
James Booth
4425aba1f2
Simplified parse_options to take gchar**
2014-04-15 00:13:32 +01:00
James Booth
56a9ae6e53
Merge branch 'master' into plugins
2014-04-14 23:44:10 +01:00
James Booth
79088d0150
Clean up keys after using parse_options
2014-04-14 23:41:45 +01:00
James Booth
3e69d6b71e
Refactored cmd_join to use parse_options
2014-04-14 23:36:00 +01:00
