[telepathy-butterfly/f16] Add pach to fix multi-user chat. (#728397)
Brian Pepple
bpepple at fedoraproject.org
Tue Jan 17 14:10:55 UTC 2012
commit 72399bf56aa43194a492932f2a6edf90bddc7ae5
Author: Brian Pepple <bpepple at fedoraproject.org>
Date: Tue Jan 17 09:10:50 2012 -0500
Add pach to fix multi-user chat. (#728397)
...728397-MSN-Multiuserchat-was-not-possible.patch | 25 ++++++++++++++++++++
telepathy-butterfly.spec | 8 +++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fixed-Bug-728397-MSN-Multiuserchat-was-not-possible.patch b/0001-Fixed-Bug-728397-MSN-Multiuserchat-was-not-possible.patch
new file mode 100644
index 0000000..d2d3de0
--- /dev/null
+++ b/0001-Fixed-Bug-728397-MSN-Multiuserchat-was-not-possible.patch
@@ -0,0 +1,25 @@
+From 5d13cb368e47f87cceb62ee21e0aa4046b3d1f68 Mon Sep 17 00:00:00 2001
+From: Bernhard Redl <bernhardredl at inode.at>
+Date: Mon, 16 Jan 2012 23:57:40 +0100
+Subject: [PATCH] Fixed Bug 728397 : MSN Multiuserchat was not possible
+
+---
+ butterfly/channel/muc.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/butterfly/channel/muc.py b/butterfly/channel/muc.py
+index 04332e5..ac2db30 100644
+--- a/butterfly/channel/muc.py
++++ b/butterfly/channel/muc.py
+@@ -88,7 +88,7 @@ class ButterflyMucChannel(
+ handles.append(self._conn.self_handle)
+ if self._conversation:
+ for participant in self._conversation.participants:
+- handle = self._conn.ensure_contact_handle(contact)
++ handle = self._conn.ensure_contact_handle(participant)
+ handles.append(handle)
+
+ if handles:
+--
+1.7.7.5
+
diff --git a/telepathy-butterfly.spec b/telepathy-butterfly.spec
index 7d583dc..2a896bc 100644
--- a/telepathy-butterfly.spec
+++ b/telepathy-butterfly.spec
@@ -2,7 +2,7 @@
Name: telepathy-butterfly
Version: 0.5.15
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MSN connection manager for Telepathy
Group: Applications/Communications
@@ -10,6 +10,7 @@ License: GPLv2+
URL: http://telepathy.freedesktop.org/wiki/
Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
Patch0: 0001-bugfix-remove-bad-import-from-im-module.patch
+Patch1: 0001-Fixed-Bug-728397-MSN-Multiuserchat-was-not-possible.patch
BuildArch: noarch
@@ -32,6 +33,8 @@ and conversations
%prep
%setup -q
%patch0 -p1 -b .bad-import
+%patch0 -p1 -b .multiuser
+
%build
%configure
@@ -53,6 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
%changelog
+* Tue Jan 17 2012 Brian Pepple <bpepple at fedoraproject.org> - 0.5.15-4
+- Add pach to fix multi-user chat. (#728397)
+
* Sat Mar 19 2011 Brian Pepple <bpepple at fedoraproject.org> - 0.5.15-3
- Backport patch to fix bad import.
More information about the scm-commits
mailing list