James Booth
449df00e1e
Merge branch 'master' into osx-functional
2016-05-01 20:25:36 +01:00
James Booth
02117328f3
Update CHANGELOG
2016-05-01 20:21:21 +01:00
James Booth
d2df850f38
Update /blocked help
2016-05-01 20:20:15 +01:00
James Booth
5a48b7b7d5
Use current jid for /blocked add in chat win
2016-05-01 20:06:34 +01:00
James Booth
b8c94376aa
Add /blocked command
2016-05-01 19:39:39 +01:00
James Booth
797cb727d3
Merge branch 'master' into osx-functional
2016-05-01 01:28:22 +01:00
James Booth
c31913f8d5
Fixed test stubs
2016-05-01 01:27:37 +01:00
James Booth
b69800593f
Merge branch 'master' into osx-functional
2016-05-01 01:08:17 +01:00
James Booth
a2efda19cc
Merge remote-tracking branch 'pasis/const-char'
2016-05-01 00:39:16 +01:00
James Booth
5bf9777468
Merge branch 'master' into osx-functional
2016-04-30 23:31:16 +01:00
James Booth
623fbe9e47
Plugins: Added prof_disco_add_feature()
2016-04-30 23:00:07 +01:00
James Booth
a718e6f91b
Refactored /account set commands
2016-04-28 01:13:42 +01:00
James Booth
559b1608cf
Only set CC to PTHREAD_CC when value present
2016-04-27 23:02:22 +01:00
James Booth
94f0550c51
Allow --disable-icons
2016-04-27 22:49:20 +01:00
James Booth
d4789ac375
Fixed compiler errors
2016-04-27 22:10:27 +01:00
James Booth
df30d4ba52
Check first entry in command sub_funcs
2016-04-27 21:52:58 +01:00
Dmitry Podgorny
efbf233c85
Define stanza's attributes as const char*
...
In most get-like funcitons libstrophe returns pointer to a string
that resides in an internal structure (e.g. xmpp_stanza_t). Hence,
Profanity must not change such strings. Define respective variables
as 'const char*' to reduce a chance of error and conform future
libstrophe's interface.
This patch mostly replaces 'char *' with 'const char*', but also
fixes two memory leaks after stanza_get_reason(). Add comment within
stanza_get_reason() to fix conflict with different allocator types.
2016-04-27 10:31:28 +00:00
James Booth
5e47377dfd
Merge branch 'master' into osx-functional
2016-04-27 01:39:57 +01:00
James Booth
5687c3e419
Free inputrc string
...
fixes #797
2016-04-27 01:36:14 +01:00
James Booth
282872c746
Merge branch 'master' into osx-functional
2016-04-27 00:43:16 +01:00
James Booth
a7524bc3a7
Fixed typo
2016-04-27 00:42:58 +01:00
James Booth
d24c05b301
Merge remote-tracking branch 'origin/osx-functional' into osx-functional
2016-04-27 00:41:28 +01:00
James Booth
aa9104644a
Merge branch 'master' into osx-functional
2016-04-27 00:41:15 +01:00
James Booth
2614b7adc3
Updated CHANGELOG
2016-04-27 00:40:53 +01:00
James Booth
38652efb19
Fixed tests
2016-04-27 00:30:33 +01:00
James Booth
ce32814679
Updated Command structure comments
2016-04-27 00:03:24 +01:00
James Booth
d4aa73159e
Merge branch 'master' into subcmds
2016-04-26 23:56:12 +01:00
James Booth
35623df641
Merge branch 'master' into osx-functional
2016-04-26 23:37:16 +01:00
James Booth
043a673fe1
Merge remote-tracking branch 'asdil12/xep_0363_http_file_upload'
2016-04-26 23:30:26 +01:00
James Booth
4ca6296fb7
Fix OSX compile
2016-04-26 23:50:56 +02:00
James Booth
65960dfbb2
Fixed cygwin compile (again)
2016-04-26 23:50:56 +02:00
James Booth
9d263d7c83
Fixed cygwin compile
2016-04-26 23:50:55 +02:00
James Booth
261bbd3fc0
Removed only add -lgio-2.0 manually on OSX
2016-04-26 23:50:55 +02:00
James Booth
fcf486d6b2
Added include to fix tests
2016-04-26 23:50:55 +02:00
James Booth
167553ae8f
Fixed functional test ID based stubs
2016-04-26 23:50:55 +02:00
Dominik Heidler
1b0ce852bb
Implement XEP-0363: HTTP File Upload
2016-04-26 23:50:55 +02:00
James Booth
0ff29b3d2e
Added sub commands to command structure
2016-04-26 20:29:45 +01:00
Dominik Heidler
28e260c7da
Cache all disco items and features on connect
2016-04-20 00:19:40 +02:00
James Booth
ae14d46739
Merge branch 'master' into osx-functional
2016-04-18 00:37:49 +01:00
James Booth
20a0313d17
Show correct tray icon immediately on enable
2016-04-18 00:35:03 +01:00
James Booth
12727744ab
Load/destroy tray icons on init/shutdown
2016-04-18 00:26:17 +01:00
James Booth
de65f505a8
Moved gtk specific code to tray.c
2016-04-18 00:07:15 +01:00
James Booth
507ea5746c
Grouped tray icon initialisation code
2016-04-17 23:57:05 +01:00
James Booth
43d1509c52
Merge branch 'master' into osx-functional
2016-04-17 23:47:43 +01:00
James Booth
153552ed07
Remove redundant return value from _cmd_set_boolean_preference
2016-04-17 23:46:29 +01:00
James Booth
35a471baa7
Merge branch 'master' into osx-functional
2016-04-17 23:36:43 +01:00
James Booth
2daa02cb60
Merge remote-tracking branch 'asdil12/tray_config'
2016-04-17 23:17:43 +01:00
Dominik Heidler
4cb1d73a83
Make tray icon configurable using /tray cmd
2016-04-16 16:29:32 +02:00
James Booth
4004e032fc
Merge branch 'master' into osx-functional
2016-04-15 23:03:22 +01:00
James Booth
6cc04bc3ba
Merge branch 'muc-hooks'
2016-04-15 22:58:32 +01:00