summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-02-29Merge branch 'cleanups'HEADmasterJonny Lamb13-1545/+414
2012-02-29muc-channel: use one property pair per line with g_object_getJonny Lamb1-5/+9
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-02-23Fix Android build after plugin library refactorAlvaro Soliverez2-4/+16
2012-02-22Update NEWSOlli Salli1-1/+3
2012-02-22Merge branch 'build-with-dummy-on-windows'Olli Salli20-32/+168
Reviewed-by: Olli Salli (oggis) <olli.salli@collabora.co.uk> Reviewed-by: Simon McVittie (smcv) <simon.mcvittie@collabora.co.uk>
2012-02-22Fix stuff caught by check-coding-style in siraj's codeOlli Salli3-14/+14
2012-02-22telepath-salut: Include socket headers only on UnixSiraj Razick5-1/+26
Unix specific socket headers should not be included unconditionally, since it's not supported by Windows.
2012-02-22salut: Support using the dummy backendSiraj Razick3-2/+20
2012-02-22protocol: Use the backend defined by the userSiraj Razick1-0/+11
The protocol now supports both dummy and avahi backends.
2012-02-22tubes-stream: Make it compile under windows.Siraj Razick1-3/+20
ifdef Unix specific code similar to tubes-stream in gabble
2012-02-22salut-connection: including avahi header only when we use USE_BACKEND_AVAHISiraj Razick1-0/+4
Including the file without any condtions results in a compilation error
2012-02-22build: Include Avahi source when compiling --with-backend=avahiSiraj Razick1-1/+5
Include Avahi sources only when we compile avahi not always
2012-02-22write-mgr-file: Use $(EXEEXT) when compiling for windowsSiraj Razick1-2/+2
If we don't append this to the bianry the build system will try to recompile write-mgr-file again with the wrong parameters and the build fails
2012-02-22configure.ac: Add --with-backend option to choose the backendSiraj Razick1-4/+21
Add --with-backend=avahi and no option to configure script and define USE_BACKEND_AVAHI/DUMMY so we can selectivly include the headers and protect the code as needed. Using --without-backend is equlant to using --with-backend=no
2012-02-22file-transfer-channel: Disable file-trasnfer for WindowsSiraj Razick1-0/+12
setup_local_socket returns false if the platform is not unix, so salut_file_transfer_channel_accept_file and salut_file_transfer_channel_provide_file will fail with errors on windows.
2012-02-22build: Detect The platform at conifgure timeSiraj Razick1-0/+15
This patch adds $platform variable to the configure script and OS_WINDOWS AM variable which can be used with Makefile.am files
2012-02-22build: Define _WIN32_WINNT=0x0501 when compiling tp-salutSiraj Razick1-0/+4
-D_WIN32_WINNT=0x0501 need to be defined for getnameinfo to work when cross compiling for windows
2012-02-22gibber: Make gibber cross compile with mingw32Siraj Razick5-12/+17
The patch provides the changes required to make gibber compile under mingw32. - Index is replaced with strchr since index is deprecated and not included in mingw32 sdk - D_WIN32_WINNT=0x0501 is defined to make getnameinfo work - And other compile fixes
2012-02-22build: Fix linker errors from libsalut-plugins.dllSiraj Razick1-2/+6
The build doesn't output libsalut-plugin.dll since telepathy-glib is and wocky libs are not added to libsalut_plugins_la, and debug.c is not part of the libsalut_plugin_la sources.
2012-02-21Start 0.7.2 devOlli Salli2-1/+6
2012-02-21Update NEWSOlli Salli1-0/+1
2012-02-21Merge branch 'Early2000sLinuxUser'Olli Salli2-6/+6
Reviewed-by: Simon McVittie (smcv) <simon.mcvittie@collabora.co.uk>
2012-02-21Make receive-file-ipv6 test be reported as SKIP with no IPv6Olli Salli1-4/+5
2012-02-21receive-file-ipv6 test: Don't even try to listen if IPv6 is disabledOlli Salli1-4/+4
Because that just threw up for me.
2012-02-21Fix IPv6 enabled check in avahitest.pyOlli Salli1-2/+1
With my IPv4-only system, already the socket() call fails with EAFNOSUPPORT. So that should be inside the try: section as well
2012-02-20Version 0.7.1Olli Salli2-4/+15
2012-02-20Merge remote-tracking branch 'siraj/plugin-api'Olli Salli15-97/+286
Reviewed-by: Jonny Lamb (jonnylamb) <jonny.lamb@collabora.co.uk> Reviewed-by: Olli Salli (oggis) <olli.salli@collabora.co.uk>
2012-02-17plugins: Create a new library libsalut-plugins containing the plugin APISiraj Razick3-7/+23
The patch moves the symbols required by plugins, into a new library libsalut-plugins.la
2012-02-17salut-connection: Merge src/connection.h and salut/connection.hSiraj Razick6-61/+29
SalutConnection is not used by plugins anymore so this patch merges src/connection.h and salut/connection.h into a single file.
2012-02-17plugins: Replace SalutConnection with SalutPluginConnection in pluginsSiraj Razick6-17/+23
This patch removes the use of SalutConnection in plugins and code related to loading and defining the plugin API.
2012-02-17plugins: Introduce SalutPluginConnectionInterface interfaceSiraj Razick5-4/+165
The library defines a new SalutPluginConnectionInterface which will be implemented by SalutConnection. And plugins can use SalutPluginConnection instead of using SalutConnection directly. This helps us to hide SalutConnection symbols in plugins.
2012-02-17plugins: Change the plugin API to create_sidecar_async and create_sidecar_finishSiraj Razick3-14/+52
All Salut plugins should implement these two methods hereafter. This patch also updates all the internal plugins to use this new API This way the host doesn't need to call finish on GAsyncResults that are created by the plugins.
2012-02-17Fix hardcoded library in write-mgr-fileAlvaro Soliverez1-1/+1
2012-02-06Update Wocky snapshot for one big header.Will Thompson50-137/+42
We have to lose the reference to wocky_heartbeat_source_new from the symbol hack table, because it's not exposed in Wocky's public headers any more. That's okay, though: it's not intended for use by applications, let alone plugins. https://bugs.freedesktop.org/show_bug.cgi?id=45703 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2012-02-01roomlist-channel: subclass TpBaseChannelJonny Lamb3-361/+53
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-02-01file-transfer-channel: subclass TpBaseChannelJonny Lamb3-379/+116
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-02-01muc-channel: subclass TpBaseChannelJonny Lamb4-440/+146
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-02-01im-channel: subclass TpBaseChannelJonny Lamb3-363/+93
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2012-01-05two-muc-stream-tubes: use temporary file as unix socket pathJonny Lamb1-1/+5
This is all an attempt to make the unix path socket path shorter. Fixes: fd.o#44020 Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-11-21Support building for Android.Alvaro Soliverez9-13/+124
This adds an autogen.sh and configure flag, --disable-submodules, to disable fetching the Wocky submodule (the flag is plural for consistency with other components), adds some missing compiler and linker flags, and adds targets for Androgenizer. Modified from a patch contributed by Derek Foreman. https://bugs.freedesktop.org/show_bug.cgi?id=42515
2011-11-16Use _unref instead of _free _destroy when possible.unrefXavier Claessens32-133/+133
Replace g_(ptr_)array_free (foo, TRUE) and g_hash_table_destroy with respectively g_(ptr_)array_unref (foo) and g_hash_table_unref. I used this command to generate this patch: for f in `find -name "*.c"`; do sed -i $f -re 's/g_ptr_array_free \(([^ ,]+), TRUE\)/g_ptr_array_unref \(\1\)/'; done See Danielle's blog for explanation of possible bug _free can do: http://blogs.gnome.org/danni/2011/11/16/mistakes-with-g_value_set_boxed/
2011-11-16Add coding style check for g_hash_table_destroy and g_array_free usageXavier Claessens1-0/+13
2011-11-16bump nano-versionJonny Lamb2-1/+6
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-11-16version 0.7.0Jonny Lamb2-3/+3
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-11-16tests: include xmppstream and ipv6 in EXTRA_DISTJonny Lamb1-1/+3
How on earth did this work before? Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-11-16NEWS: updatedJonny Lamb1-2/+12
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-11-16ft helper: use crazier stock metadataJonny Lamb1-2/+2
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-11-16Merge branch 'ft-metadata'Jonny Lamb24-88/+1141
2011-11-15wocky: update snapshot for sasl fix againJonny Lamb1-0/+0
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-11-15wocky: update snapshot to fix sasl build failureJonny Lamb1-0/+0
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>