rpms/telepathy-gabble/OLPC-2 gabble-roster-request-race.patch, NONE, 1.1 telepathy-gabble.spec, 1.51, 1.52

[Robert McQueen (robot101)]

Author: robot101

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6932

Modified Files:
	telepathy-gabble.spec 
Added Files:
	gabble-roster-request-race.patch 
Log Message:
* Mon Dec 10 2007 Robert McQueen <robert.mcqueen at collabora.co.uk> - 0.7.1-0.7.ol
pc2
- dev.laptop.org #5164: Add patch from upstream to fix a race when requesting
  list channels.


gabble-roster-request-race.patch:

--- NEW FILE gabble-roster-request-race.patch ---
Wed Nov 28 11:50:34 GMT 2007  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
  * roster.c: always create the requested channel so the request is not lost if the roster wasn't received yet
diff -rN -u old-telepathy-gabble/src/roster.c new-telepathy-gabble/src/roster.c
--- old-telepathy-gabble/src/roster.c	2007-12-10 18:40:31.487946628 +0000
+++ new-telepathy-gabble/src/roster.c	2007-12-10 18:40:31.511948128 +0000
@@ -1695,6 +1695,7 @@
   TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (
       (TpBaseConnection *)priv->conn, handle_type);
   gboolean created;
+  GabbleRosterChannel *chan;
 
   if (strcmp (chan_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST))
     return TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_IMPLEMENTED;
@@ -1712,11 +1713,10 @@
       !(priv->conn->features & GABBLE_CONNECTION_FEATURES_GOOGLE_ROSTER))
     return TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_AVAILABLE;
 
+  chan = _gabble_roster_get_channel (roster, handle_type, handle,
+      &created);
   if (priv->roster_received)
     {
-      GabbleRosterChannel *chan;
-      chan = _gabble_roster_get_channel (roster, handle_type, handle,
-          &created);
       *ret = TP_CHANNEL_IFACE (chan);
       return created ? TP_CHANNEL_FACTORY_REQUEST_STATUS_CREATED
                      : TP_CHANNEL_FACTORY_REQUEST_STATUS_EXISTING;


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-2/telepathy-gabble.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- telepathy-gabble.spec	7 Dec 2007 21:38:11 -0000	1.51
+++ telepathy-gabble.spec	10 Dec 2007 18:47:13 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:           telepathy-gabble
 Version:        0.7.1
-Release:        0.6%{?dist}
+Release:        0.7%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -14,6 +14,7 @@
 Patch1:         gabble-pep-notifications.patch
 Patch2:         gabble-muc-properties.patch
 Patch3:         gabble-lower-max-stanza-size.patch
+Patch4:         gabble-roster-request-race.patch 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@
 %patch1 -p1 -b .pep-notifications
 %patch2 -p1 -b .muc-props
 %patch3 -p1 -b .stanza-size
+%patch4 -p1 -b .roster-race
 
 %build
 %configure
@@ -66,6 +68,10 @@
 
 
 %changelog
+* Mon Dec 10 2007 Robert McQueen <robert.mcqueen at collabora.co.uk> - 0.7.1-0.7.olpc2
+- dev.laptop.org #5164: Add patch from upstream to fix a race when requesting
+  list channels.
+
 * Fri Dec 07 2007 Robert McQueen <robert.mcqueen at collabora.co.uk> - 0.7.1-0.6.olpc2
 - dev.laptop.org #5018: Add patch from upstream to lower maximum stanza size in
   MUC bytestreams (used for Tubes) to avoid producing packets over 64k which