[Telepathy] merge: telepathy-gabble
Merge Monkey
monkey at collabora.co.uk
Tue Apr 3 09:59:10 PDT 2007
Merge to:
telepathy-gabble
From:
/home/smcv/public_html/darcs/gabble-smcv-misc
Changes:
Simon McVittie <simon.mcvittie at collabora.co.uk>
base-connection.c: linguistic pedantry (capitalize sentence fragment if it has a full stop)
Simon McVittie <simon.mcvittie at collabora.co.uk>
TpBaseConnection: provide a default implementation of RequestHandles which should often be sufficient
Simon McVittie <simon.mcvittie at collabora.co.uk>
Amend sections.txt to cover new TpBaseConnectionStartConnectingImpl instead of old TpBaseConnectionProcWithError (the name change is for gtkdoc's benefit)
Simon McVittie <simon.mcvittie at collabora.co.uk>
heap.c: Update copyright. Remove "Contact: Olli Salli" since he doesn't work for Nokia any more.
Simon McVittie <simon.mcvittie at collabora.co.uk>
GabbleConnection: Don't reimplement GetInterfaces, use the one from TpBaseConnection instead
Simon McVittie <simon.mcvittie at collabora.co.uk>
GabbleIMChannel: Use priv->closed to make sure we don't accidentally emit Closed twice
Simon McVittie <simon.mcvittie at collabora.co.uk>
base-connection.h: Improve documentation
Simon McVittie <simon.mcvittie at collabora.co.uk>
src/: Use TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (replacing ERROR_IF_NOT_CONNECTED_ASYNC, or adding the check for the first time int the avatars code - oops!)
Simon McVittie <simon.mcvittie at collabora.co.uk>
base-connection.c: whitespace pedantry (space before parenthesis)
Simon McVittie <simon.mcvittie at collabora.co.uk>
gabble-connection.h: Wrap long lines
Simon McVittie <simon.mcvittie at collabora.co.uk>
TpDynamicHandleRepo: Move most documentation to .c to reduce recompiles. Improve documentation.
Simon McVittie <simon.mcvittie at collabora.co.uk>
TpGroupMixin: whitespace pedantry
Simon McVittie <simon.mcvittie at collabora.co.uk>
By popular demand, add tp_dynamic_handle_repo_new and tp_static_handle_repo_new. They return a TpHandleRepoIface* since that's usually what you want.
Simon McVittie <simon.mcvittie at collabora.co.uk>
Make changing status *to* TP_INTERNAL_CONNECTION_STATUS_NEW a g_return_if_fail instead of a g_assert
Simon McVittie <simon.mcvittie at collabora.co.uk>
TpGroupMixin: don't try to ref the actor handle if it's 0
Simon McVittie <simon.mcvittie at collabora.co.uk>
base-connection.c: Use TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add tp_base_connection_add_interfaces to sections.txt
Simon McVittie <simon.mcvittie at collabora.co.uk>
tp_base_connection_change_status: If the self-handle is 0, cope with it and don't assert
Simon McVittie <simon.mcvittie at collabora.co.uk>
base-connection.h: Add TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED macro
Simon McVittie <simon.mcvittie at collabora.co.uk>
Don't cause a nearly infinite loop by handling pointers incorrectly
Simon McVittie <simon.mcvittie at collabora.co.uk>
Include svc-connection.h to base-connection.h since it's now part of the API
Simon McVittie <simon.mcvittie at collabora.co.uk>
tp_base_connection_connect: Allow start_connecting() callback to change the state itself - only alter the state afterwards if necessary. Convert exceptions raised by start_connecting() into a disconnection with an appropriate reason.
Simon McVittie <simon.mcvittie at collabora.co.uk>
base-connection.c: use g_strv_length rather than reinventing it
Simon McVittie <simon.mcvittie at collabora.co.uk>
Document TpBaseConnection:protocol
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add tp_base_connection_dbus_request_handles to sections.txt
Simon McVittie <simon.mcvittie at collabora.co.uk>
Implement GabbleConnection's RequestHandles in terms of the base class' RequestHandles for all types except ROOM
Simon McVittie <simon.mcvittie at collabora.co.uk>
base-connection.h: Wrap long lines
Simon McVittie <simon.mcvittie at collabora.co.uk>
tp_base_connection_change_status: Document assumptions and valid state changes, both in a doc-comment and via assertions. If the user tries to go straight from DISCONNECTED to CONNECTED, change state to CONNECTING first to make sure we run all the callbacks
Simon McVittie <simon.mcvittie at collabora.co.uk>
Export TpBaseConnection's implementation of RequestHandles as tp_base_connection_dbus_request_handles so subclasses can partially use it
Simon McVittie <simon.mcvittie at collabora.co.uk>
AUTHORS: Sort by last name; add Senko Rasic, Sjoerd Simons, Daf Harries, Mads Chr. Olesen and Guillaume Desmottes; replace Ole Andre Ravnaas' Nokia email address with his Collabora one.
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add a generic GetInterfaces implementation
Simon McVittie <simon.mcvittie at collabora.co.uk>
Treat (gchar **)NULL as an empty strv, rather than an error, according to GLib convention
Simon McVittie <simon.mcvittie at collabora.co.uk>
tp_base_connection_finish_shutdown: mark docstring so gtkdoc recognizes it
More information about the Telepathy
mailing list