James Booth
2fb8d62706
Merge branch 'master' into plugins
2016-05-22 22:58:33 +01:00
Dmytro Podgornyi
7d857fc30e
Fix libcurl check in configure.ac for OS X
...
OS X contains libcurl without a pkg-config file and ./configure
reports error. Add AC_CHECK_LIB in order to find libcurl properly.
Also remove manual adding -lncurses and -lcurl to LIBS, because
AC_CHECK_LIB does this job.
2016-05-21 16:07:40 +03:00
James Booth
24616b7c4d
Merge branch 'master' into plugins
2016-04-30 23:31:29 +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
f5656138c6
Merge branch 'master' into plugins
...
Conflicts:
configure.ac
2016-04-26 23:43:58 +01:00
James Booth
4ca6296fb7
Fix OSX compile
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
Dominik Heidler
1b0ce852bb
Implement XEP-0363: HTTP File Upload
2016-04-26 23:50:55 +02:00
James Booth
247276146c
Merge branch 'master' into plugins
...
Conflicts:
configure.ac
2016-04-11 00:30:19 +01:00
James Booth
697db019d5
Merge remote-tracking branch 'Dav1d23/master'
...
Conflicts:
Makefile.am
install-all.sh
2016-04-11 00:23:36 +01:00
James Booth
c90a23799f
Merge branch 'master' into plugins
2016-03-31 21:20:05 +01:00
James Booth
31369e2e55
Added comment for AX_PREFIX_CONFIG_H
2016-03-31 21:19:34 +01:00
James Booth
17175bb672
Merge branch 'master' into plugins
...
Conflicts:
src/plugins/plugins.c
2016-03-31 21:16:19 +01:00
James Booth
9b177a9e01
Removed #AX_PREFIX_CONFIG_H
2016-03-31 21:05:02 +01:00
David
1e60d17d7c
libgtk is now optional
...
Having the lib is no more needed.
2016-03-30 23:21:41 +02:00
James Booth
5cc149c811
Merge branch 'master' into plugins
2016-03-23 23:41:36 +00:00
Dmitry Podgorny
5278572fec
autotools: Disable python-plugins by default
...
Profanity doesn't build with Python-3.5. This patch temporary disables
python api unless user enable it explicitly.
2016-03-24 00:36:07 +02:00
David
098d84ef73
Merge branch 'tray_icon' into HEAD
...
Let's thanks Aline <linuxine@gmail.com> for the icons.
Enjoy!
2016-03-12 17:37:46 +01:00
James Booth
5b2390e20f
Merge branch 'master' into plugins
...
Conflicts:
.travis.yml
Makefile.am
configure-plugins
configure.ac
src/plugins/plugins.c
src/plugins/plugins.h
src/plugins/python_api.c
src/plugins/python_plugins.c
2016-03-11 00:15:26 +00:00
David
718a708b93
Use a folder to add icons
...
NOTE: it is not working in this release, I have to get how to retrieve
icons from folder.
2016-03-07 22:26:48 +01:00
David
dc0c3cc699
Introduce Tray Icon for Profanity
...
Add tray icon for profanity based on Gtk StatusIcon.
Different icon is displayed in case the user has unread messages.
2016-03-06 19:10:46 +01:00
James Booth
2c7a4e4843
Added workaround for http://bugs.python.org/issue3588
2016-03-02 23:00:47 +00:00
James Booth
7cf8f47fa6
Moved python flags to LIBS in configure.ac
2016-02-28 21:14:10 +00:00
James Booth
0fc0b3eeec
Added python plugins code
2016-02-24 00:31:55 +00:00
James Booth
41fe8c22b1
Added C plugin code from plugins branch
2016-02-14 22:28:55 +00:00
James Booth
e8ae73c71e
Updated version to 0.5.0 dev
2015-12-02 00:27:29 +00:00
James Booth
c68985bae0
Merge branch 'master' into plugins
2015-10-12 23:38:04 +01:00
James Booth
6e28df66e8
Use libstrophe/libmesode uuid generator
2015-10-12 23:37:11 +01:00
James Booth
79d3aae50e
Merge branch 'master' into plugins
...
Conflicts:
.travis.yml
configure.ac
src/profanity.c
src/xmpp/connection.c
2015-09-24 22:37:18 +01:00
James Booth
2b88e2f1bf
Check for libmesode, fall back to libstrophe
2015-09-21 21:40:04 +01:00
James Booth
14edbe1770
Set development version
2015-09-20 18:48:43 +01:00
James Booth
60acf6f05b
Release 0.4.7
2015-09-20 16:46:29 +01:00
James Booth
d618b3d2ed
Merge branch 'master' into plugins
2015-07-20 23:28:58 +01:00
James Booth
c5a04de9fb
Added libexpect check for functional tests
2015-07-20 23:28:23 +01:00
James Booth
82ab1e5121
Merge branch 'master' into plugins
...
Conflicts:
Makefile.am
2015-07-08 20:54:53 +01:00
James Booth
252c7c2e06
Only run functional tests when libstabber available
2015-07-03 15:14:34 +01:00
James Booth
398c3c0ba6
Merge branch 'master' into plugins
...
Conflicts:
src/event/server_events.c
2015-06-23 23:43:14 +01:00
Dmitry Podgorny
c47688f37c
autotools: Don't link profanity with libstabber
2015-06-23 22:33:51 +00:00
James Booth
2d3537515d
Added AC_SYS_LARGEFILE to configure.ac
2015-06-23 20:37:42 +01:00
James Booth
52fd5c2a61
Merge branch 'master' into plugins
2015-06-22 20:36:29 +01:00
James Booth
24ebb51254
Use AM_CPPFLAGS for gpgme-config --cflags
2015-06-22 20:35:46 +01:00
James Booth
48e3f0a479
Merge branch 'master' into plugins
2015-06-22 20:08:49 +01:00
James Booth
f81873824b
Use gpgme-config
2015-06-22 20:08:22 +01:00
James Booth
54df2101be
Tidied gpgme check
2015-06-22 18:48:00 +01:00
James Booth
00142f61e9
Merge branch 'master' into plugins
2015-06-21 23:32:23 +01:00
James Booth
2c8b598d3f
Merge remote-tracking branch 'pasis/configure-cleanup'
2015-06-21 23:32:03 +01:00
James Booth
1087041dcf
Merge branch 'master' into plugins
...
Conflicts:
.travis.yml
src/command/commands.c
src/event/client_events.c
src/event/server_events.c
src/ui/core.c
src/ui/titlebar.c
2015-06-21 23:22:09 +01:00
Dmitry Podgorny
1dba341da8
autotools: Avoid copy-paste in configure.ac
2015-06-21 21:29:20 +00:00
