rpms/telepathy-salut/OLPC-2 salut-debug.patch, NONE, 1.1 telepathy-salut.spec, 1.38, 1.39

[Morgan Collett (morgan)]

Author: morgan

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

Modified Files:
	telepathy-salut.spec 
Added Files:
	salut-debug.patch 
Log Message:
Adding patch for dev.laptop.org #6782


salut-debug.patch:

--- NEW FILE salut-debug.patch ---
Fri Mar 28 09:02:42 GMT 2008  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
  * muc-channel: add debug info about membership management
--- old-telepathy-salut-0.2/src/salut-muc-channel.c	2008-03-28 10:26:16.578430935 +0000
+++ new-telepathy-salut-0.2/src/salut-muc-channel.c	2008-03-28 10:26:16.606432685 +0000
@@ -265,6 +265,8 @@
   SalutMucChannel *self = SALUT_MUC_CHANNEL (user_data);
   SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self);
 
+  DEBUG ("Didn't receive muc senders. Timeout expired, "
+      "adding myself as member anyway");
   salut_muc_channel_add_self_to_members (self);
   priv->timeout = 0;
 
@@ -278,10 +280,17 @@
   SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self);
 
   if (priv->creator)
-    salut_muc_channel_add_self_to_members (self);
+    {
+      DEBUG ("I created this muc. Adding myself as member now");
+      salut_muc_channel_add_self_to_members (self);
+    }
   else
-    priv->timeout = g_timeout_add (CONNECTED_TIMEOUT, connected_timeout_cb,
-        self);
+    {
+      DEBUG ("I didn't create this muc. Waiting for senders before adding "
+          "myself as member");
+      priv->timeout = g_timeout_add (CONNECTED_TIMEOUT, connected_timeout_cb,
+          self);
+    }
 
   salut_muc_channel_publish_service  (self);
 }
@@ -1173,7 +1182,10 @@
   salut_muc_channel_add_members (self, senders);
   if (!tp_handle_set_is_member (self->group.members,
       base_connection->self_handle))
-    salut_muc_channel_add_self_to_members (self);
+    {
+      DEBUG ("Got new senders. Adding myself as member");
+      salut_muc_channel_add_self_to_members (self);
+    }
 }
 
 static void



Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-2/telepathy-salut.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- telepathy-salut.spec	20 Mar 2008 13:50:45 -0000	1.38
+++ telepathy-salut.spec	28 Mar 2008 10:40:38 -0000	1.39
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -9,6 +9,7 @@
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 Patch0:         salut-olpc-no-dbus-uid-check.patch
 Patch1:         salut-chmod-unix-socket.patch
+Patch2:         salut-debug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -35,6 +36,7 @@
 %setup -q
 %patch0 -p1 -b .dbus-uid
 %patch1 -p1 -b .chmod-socket
+%patch2 -p1 -b .debug-6782
 
 
 %build
@@ -60,6 +62,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Fri Mar 28 2008 Morgan Collett <morgan.collett at collabora.co.uk> - 0.2.3-2.olpc2
+- dev.laptop.org #6782: Improve debug info when joining a muc
+
 * Thu Mar 20 2008 Morgan Collett <morgan.collett at collabora.co.uk> - 0.2.3-1.olpc2
 - Upstream release 0.2.3
 - dev.laptop.org #6575: muc receives message but can't send anymore