#4696 NORM Update.: Gabble: merge upstream release 0.7.0 to improve maintainability
Zarro Boogs per Child
bugtracker at laptop.org
Tue Nov 6 12:38:03 EST 2007
#4696: Gabble: merge upstream release 0.7.0 to improve maintainability
------------------------------+---------------------------------------------
Reporter: smcv | Owner: ApprovalForUpdate
Type: task | Status: new
Priority: normal | Milestone: Update.1
Component: telepathy-gabble | Version:
Keywords: | Verified: 0
------------------------------+---------------------------------------------
We've finally got all the OLPC-specific changes through upstream code
review, which turned up quite a few bugs waiting to happen (#4694 is the
latest). We now plan to make a new development release 0.7.0 (it'll
probably be tomorrow, now), and we'd like to get that into OLPC.
There have only been a couple of changes upstream since we last
synchronized the upstream version into the OLPC branch. As well as the fix
for #4694, we intend to ship the following changes (relative to the
current OLPC snapshot) in 0.7.0:
* allow pipeline debug messages to be enabled
* correctly propagate an error to the function's caller (in an avatar-
related code path, so this won't happen on OLPC anyway)
* emit media stream errors correctly (also in a code path not used by
OLPC)
* add a short man page (we can delete this in the RPM if you don't want
it)
Can we merge these into the OLPC branch and hence Update.1? Diff below.
{{{
diff -rN -u -p old-tmpicZUHb/_boring new-tmpicZUHb/_boring
--- old-tmpicZUHb/_boring 2007-11-06 17:12:51.506788916 +0000
+++ new-tmpicZUHb/_boring 2007-11-06 17:12:51.816811980 +0000
@@ -88,3 +88,4 @@
^extensions/extensions\.html$
^docs/.*\.html$
^docs/xep\.xsl$
+^docs/telepathy-gabble\.8$
diff -rN -u -p old-tmpicZUHb/docs/Makefile.am new-
tmpicZUHb/docs/Makefile.am
--- old-tmpicZUHb/docs/Makefile.am 2007-11-06 17:12:51.506788916
+0000
+++ new-tmpicZUHb/docs/Makefile.am 2007-11-06 17:12:51.876816444
+0000
@@ -1,3 +1,13 @@
+man_MANS = telepathy-gabble.8
+
+EXTRA_DIST = $(man_MANS:.8=.8.in)
+CLEANFILES = $(man_MANS)
+
+%.8: %.8.in Makefile
+ sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
+
+# ---- Proto-XEPs (not automatically generated, see README) ----
+
PROTO_XEP_XML = \
olpc.xml \
muc-bytestream.xml \
@@ -21,4 +31,4 @@ xep.xsl:
@echo "wget
'http://svn.xmpp.org:18080/browse/~raw,r=1214/XMPP/trunk/extensions/xep.xsl'"
@exit 1
-EXTRA_DIST = $(PROTO_XEP_XML)
+EXTRA_DIST += $(PROTO_XEP_XML)
diff -rN -u -p old-tmpicZUHb/docs/telepathy-gabble.8.in new-tmpicZUHb/docs
/telepathy-gabble.8.in
--- old-tmpicZUHb/docs/telepathy-gabble.8.in 1970-01-01
01:00:00.000000000 +0100
+++ new-tmpicZUHb/docs/telepathy-gabble.8.in 2007-11-06
17:12:51.906818676 +0000
@@ -0,0 +1,37 @@
+.TH TELEPATHY-GABBLE "8" "October 2007" "Telepathy" "D-Bus services"
+\" This man page was written by Simon McVittie for the Debian project,
+\" but may be used by others.
+\" Copyright © 2007 Collabora Ltd. <http://www.collabora.co.uk/>
+\" It may be distributed under the same terms as telepathy-gabble itself.
+.SH NAME
+telepathy-gabble \- Telepathy connection manager for XMPP (Jabber)
+.SH SYNOPSIS
+\fB at libexecdir@/telepathy\-gabble\fR
+.SH DESCRIPTION
+Gabble implements the Telepathy D-Bus specification for XMPP (Jabber),
+allowing Telepathy clients like
+.BR empathy (1)
+to connect to XMPP accounts, including Google Talk.
+.PP
+It is a D-Bus service which runs on the session bus, and should usually
be
+started automatically by D-Bus activation. However, it might be useful to
+start it manually for debugging.
+.SH OPTIONS
+There are no command-line options.
+.SH ENVIRONMENT
+.TP
+\fBGABBLE_LOGFILE\fR=\fIfilename\fR
+If set, debug output will go to the given file rather than to stderr.
+.TP
+\fBGABBLE_DEBUG\fR=\fItype\fR
+May be set to "all" for full debug output, or various undocumented
options
+(which may change from release to release) to filter the output.
+\fBLM_DEBUG\fR=\fItype\fR
+May be set to "all" for full debug output from the Loudmouth XMPP library
used
+by Gabble, or various undocumented options (which may change from release
to
+release) to filter the output. For general Gabble debugging, "net" is
+recommended.
+.SH SEE ALSO
+.IR http://telepathy.freedesktop.org/ ,
+.IR http://telepathy.freedesktop.org/wiki/CategoryGabble ,
+.BR empathy (1)
diff -rN -u -p old-tmpicZUHb/src/conn-avatars.c new-tmpicZUHb/src/conn-
avatars.c
--- old-tmpicZUHb/src/conn-avatars.c 2007-11-06 17:12:51.496788172
+0000
+++ new-tmpicZUHb/src/conn-avatars.c 2007-11-06 17:12:51.606796356
+0000
@@ -61,12 +61,8 @@ update_own_avatar_sha1 (GabbleConnection
if (!_gabble_connection_signal_own_presence (conn, &error))
{
- if (out_error == NULL)
- {
- DEBUG ("failed to signal changed avatar sha1 to the server:
%s",
- error->message);
- g_error_free (error);
- }
+ DEBUG ("failed to signal changed avatar sha1 to the server: %s",
+ error->message);
g_propagate_error (out_error, error);
diff -rN -u -p old-tmpicZUHb/src/debug.c new-tmpicZUHb/src/debug.c
--- old-tmpicZUHb/src/debug.c 2007-11-06 17:12:51.496788172 +0000
+++ new-tmpicZUHb/src/debug.c 2007-11-06 17:12:51.536791148 +0000
@@ -64,6 +64,7 @@ static GDebugKey keys[] = {
{ "connection", GABBLE_DEBUG_CONNECTION },
{ "persist", GABBLE_DEBUG_PERSIST },
{ "vcard", GABBLE_DEBUG_VCARD },
+ { "pipeline", GABBLE_DEBUG_PIPELINE },
{ "jid", GABBLE_DEBUG_JID },
{ "olpc", GABBLE_DEBUG_OLPC },
{ "bytestream", GABBLE_DEBUG_BYTESTREAM },
diff -rN -u -p old-tmpicZUHb/src/gabble-media-session.c new-tmpicZUHb/src
/gabble-media-session.c
--- old-tmpicZUHb/src/gabble-media-session.c 2007-11-06
17:12:51.506788916 +0000
+++ new-tmpicZUHb/src/gabble-media-session.c 2007-11-06
17:12:51.576794124 +0000
@@ -635,7 +635,7 @@ gabble_media_session_error (TpSvcMediaSe
for (i = 0; i < tmp->len; i++)
{
- GabbleMediaStream *stream = g_ptr_array_index (priv->streams, i);
+ GabbleMediaStream *stream = g_ptr_array_index (tmp, i);
gabble_media_stream_error (stream, errno, message, NULL);
}
}}}
--
Ticket URL: <http://dev.laptop.org/ticket/4696>
One Laptop Per Child <http://dev.laptop.org>
OLPC bug tracking system
More information about the Bugs
mailing list