summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-08-06Fix mismatched conditionalHEADmasterSimon McVittie1-0/+1
2012-08-06*/status.c: don't crash if form fields have unexpected typesSimon McVittie2-17/+25
FORM_TYPE should be hidden, type should be text-single, and name and caps should be text-multi. This is significant because if the types of name and caps are not explicitly specified in the message, Wocky will guess. If there is only one value, it will guess text-single, and the GValue will contain G_TYPE_STRING, not G_TYPE_STRV, causing a crash when we call g_value_get_boxed. Reviewed-by: Olli Salli <olli.salli@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45236
2012-08-06Explicitly specify the form type of every Yts form fieldSimon McVittie1-0/+3
Otherwise, the client side will have to guess it: text-multi if there is more than one of something, otherwise text-single. Reviewed-by: Olli Salli <olli.salli@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45236
2012-08-06ytst_caps_manager_represent_client: in Salut, remember caps, not just formsSimon McVittie1-2/+26
Otherwise we lose our interest in services' statuses whenever a new Ytstenut client is added - even if it's just a temporary one for the request-and-handle pattern. Reviewed-by: Olli Salli <olli.salli@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53167
2012-08-06Avoid TP_ERRORSSimon McVittie7-31/+31
Reviewed-by: Olli Salli <olli.salli@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53160
2012-08-06Depend on GLib 2.30 and telepathy-glib 0.18Simon McVittie1-1/+7
Reviewed-by: Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53162
2012-03-29build: Look for correct gabble and salut plugin dirs in configure.acRob Staudinger1-2/+2
Gabble's and Salut's pkg-config files changed the variable names of the place to plug plugins to "pluginexecdir", so this is the thing we need to be looking for now, over the old "plugindir". Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=48060
2012-03-16Merge branch 'standalone-salut-plugin'Olli Salli3-6/+7
Reviewed-by: Olli Salli <olli.salli@collabora.co.uk>
2012-03-16Update accordingly with latest salut plugin API changesOlli Salli1-2/+2
2012-03-16Use send_ll_pep_event from wocky rather than salutOlli Salli1-2/+1
2012-03-15Don't include salut/protocol.h, which is not part of the plugin API anymoreOlli Salli1-1/+1
2012-03-15Fixed salut initialization to use a callback and not calling code thatAlvaro Soliverez1-2/+3
is in salut core and not in the plugin code
2012-03-15Use -no-undefined linker flag for building salut pluginOlli Salli1-1/+1
So it builds as a DLL on windows NOTE: this doesn't make the linker whine about undefined symbols on linux. This is a libtool policy libtool -no-undefined is a no-op on Linux. So we need the buildbot windows target to verify we don't end up using symbols which aren't really in the salut-plugins library.
2012-03-13Actually link the salut plugin against salut libsOlli Salli1-0/+1
2012-02-27Copy plugin-base files to salut directoryAlvaro Soliverez2-0/+8
This is needed because in some platforms (eg Android) the files cannot be compiled twice. Therefore, we copy the files to salut's directory and build there. The copied files are added to .gitignore to prevent those files from being added to the repository
2012-02-27Copy plugin-base files to gabble directoryAlvaro Soliverez2-0/+8
This is needed because in some platforms (eg Android) the files cannot be compiled twice. Therefore, we copy the files to gabble's directory and build there. The copied files are added to .gitignore to prevent those files from being added to the repository
2012-02-27Fixed linking after salut plugin library refactorAlvaro Soliverez1-11/+13
2012-02-27Fixed linking after gabble plugin library refactorAlvaro Soliverez1-1/+1
2012-02-23Add option to build with shared Wocky libraryAlvaro Soliverez2-4/+13
2012-02-22Fix linking after gabble puglin refactorAlvaro Soliverez1-1/+1
2012-02-22Support for building on Android, modified from patches by Derek Foreman and ↵Alvaro Soliverez6-17/+97
Johnny Lamb
2012-02-22respect HAVE_GETTEXTDerek Foreman1-0/+5
2012-02-21Merge branch 'salut-api-update'Will Thompson8-55/+41
Conflicts: gabble/message-channel.c gabble/status.c salut/message-channel.c salut/status.c
2012-02-20configure: fix compilation of Salut pluginWill Thompson1-1/+1
Commit 4f94ae6 typoed the implementation of --enable-salut-plugin, so HAVE_TP_SALUT was always false.
2012-02-20plugin-base: Remove The duplicate TpBaseConnection.Siraj Razick1-2/+2
Gabble and Salut Plugin API was updated to remove the dupliate TpBaseconnection from create_channel_managers. This patch updates the plugin-base to match the API change Signed-off-by: Rob Staudinger <robsta@linux.intel.com>
2012-02-17plugin-base: Remove The duplicate TpBaseConnection.Siraj Razick1-2/+2
Gabble and Salut Plugin API was updated to remove the dupliate TpBaseconnection from create_channel_managers. This patch updates the plugin-base to match the API change
2012-02-16Fixed wocky includesAlvaro Soliverez11-33/+7
2012-02-08salut-plugin: Update the salut plugin code to match the API changes.Siraj Razick6-47/+41
telepathy-salut now uses a seperate library for plugins, similar to mission control and gabble, This patch updates salut plugin to use this new library, and the releated API changes which the new plugin API introduces. (mainly the following) - Use SalutPluginConnection instead of SalutConnection - Assign ytstenut_plugin_create_sidecar_finish to create sidecar_finish - Use salut_plugin_connection_get_name and salut_plugin_connection_get_session fdo bug : https://bugs.freedesktop.org/show_bug.cgi?id=45804
2012-02-08build: Fix typo in AM_CONDITIONAL for HAVE_TP_SALUTSiraj Razick1-1/+1
it should be enable_salut_plugin not enable_salt_plugin. So HAVE_TP_SALUT is never true when --enable-salut-plugin is issued for configure script.
2012-02-08build: Fix 'make distcheck'Rob Staudinger2-10/+1
A few filenames in tests/twisted/tools were too long for default 'tar', call AM_INIT_AUTOMAKE with 'tar-ustar' for remedy. Also tests/twisted/Makefile.am had non-existant files in EXTRA_DIST, which prevented the dist from finishing. Remove those. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45773
2012-02-07Update to use single <wocky/wocky.h> include.Will Thompson11-29/+11
https://bugs.freedesktop.org/show_bug.cgi?id=45704
2012-02-01Produce .dll files when compiling for windowsSiraj Razick1-1/+1
Add -no-undefined option so that .dll files are created during windows builds.
2012-02-01ifdef gabble specific API which is not shared with salut anymoreSiraj Razick1-7/+8
Address the review comments of fdo#44447. This patch fixes the salut build, since the plugins API of gabble and salut is different at this point.
2012-02-01Plugin sidecar_finish method to match the plugin API changeSiraj Razick1-0/+22
2012-02-01Updates the Code to match the New Gabble Plugin APISiraj Razick6-34/+47
Use GabblePluginConnection instead of GabbleConnection
2012-02-01Add to new configure options to enable/disable the desired pluginsSiraj Razick2-3/+33
--enable-salut-plugin builds the sault plugin and --enable-gabble-plugin builds the gabble plugin
2012-01-09configure: fail if gabble or salut isn't foundJonny Lamb1-2/+2
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-12-13autogen.sh: add missing shbangJonny Lamb1-0/+1
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-30Merge branch 'gabble'Jonny Lamb37-52/+6031
2011-09-29mission-control: set presence using the name as well as the IDJonny Lamb1-5/+7
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-08mission-control: don't return from D-Bus method twiceJonny Lamb1-0/+1
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-08Adjust namespaces so they start with org.freedesktopRob Staudinger4-18/+18
Signed-off-by: Rob Staudinger <robsta@linux.intel.com>
2011-09-08build: Bump version to 0.2.0Rob Staudinger1-1/+1
Signed-off-by: Rob Staudinger <robsta@linux.intel.com>
2011-09-07plugin-base: use more #defines to use fewer #ifdefsJonny Lamb2-42/+19
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-07gabble/status: look at the roster for other services when ensuredJonny Lamb3-14/+186
If we ensure the status sidecar way into a connection, Gabble might already know about services, so the status needs to update its properties. Finally, now it can! I even added a test. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-07tests: add salut test for getting the sidecar late worksJonny Lamb2-0/+203
If a contact appears and displays that it has support for all these services, we should remember this when the Status sidecar appears later on in the CM process. This works fine in salut. It will not work yet in gabble. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-07gabble tests: copy over salut tests and make them passJonny Lamb7-20/+1210
These are all copies of the salut tests, but it's really not worth trying to make them work on both salut and gabble so here is some code duplication. Sorry. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-07status: fix implementation of publish nodes in pep messagesJonny Lamb2-2/+2
Previously, I'd done: ... <items xmlns="the-node"> ... when actually it should be: ... <items node="the-node"> ... Bad me. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-07gabble/status: when sending a publish pep event, actually send it as an IQJonny Lamb1-1/+1
This way it'll have an id stamped on. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
2011-09-07yconstants: add the service nsJonny Lamb1-0/+1
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>