rpms/telepathy-butterfly/F-12 telepathy-butterfly-disable-av.patch, NONE, 1.1 telepathy-butterfly.spec, 1.19, 1.20
Brian Pepple
bpepple at fedoraproject.org
Tue Dec 8 16:11:19 UTC 2009
Author: bpepple
Update of /cvs/pkgs/rpms/telepathy-butterfly/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23790
Modified Files:
telepathy-butterfly.spec
Added Files:
telepathy-butterfly-disable-av.patch
Log Message:
* Sat Nov 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-2
- Add patch to disable audio-visual capabilities.
telepathy-butterfly-disable-av.patch:
capabilities.py | 30 +++++++++++++++---------------
connection.py | 28 ++++++++++++++--------------
2 files changed, 29 insertions(+), 29 deletions(-)
--- NEW FILE telepathy-butterfly-disable-av.patch ---
diff -urp telepathy-butterfly-0.5.3.orig/butterfly/capabilities.py telepathy-butterfly-0.5.3/butterfly/capabilities.py
--- telepathy-butterfly-0.5.3.orig/butterfly/capabilities.py 2009-10-21 08:59:00.000000000 -0400
+++ telepathy-butterfly-0.5.3/butterfly/capabilities.py 2009-11-18 20:30:42.141898565 -0500
@@ -39,14 +39,14 @@ class ButterflyCapabilities(
dbus_interface = telepathy.CONNECTION_INTERFACE_CAPABILITIES
def AdvertiseCapabilities(self, add, remove):
- for caps, specs in add:
- if caps == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
- if specs & telepathy.CHANNEL_MEDIA_CAPABILITY_VIDEO:
- self._self_handle.profile.client_id.has_webcam = True
- self._self_handle.profile.client_id.supports_rtc_video = True
- for caps in remove:
- if caps == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
- self._self_handle.profile.client_id.has_webcam = False
+ #for caps, specs in add:
+ #if caps == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
+ #if specs & telepathy.CHANNEL_MEDIA_CAPABILITY_VIDEO:
+ #self._self_handle.profile.client_id.has_webcam = True
+ #self._self_handle.profile.client_id.supports_rtc_video = True
+ #for caps in remove:
+ #if caps == telepathy.CHANNEL_TYPE_STREAMED_MEDIA:
+ #self._self_handle.profile.client_id.has_webcam = False
return telepathy.server.ConnectionInterfaceCapabilities.\
AdvertiseCapabilities(self, add, remove)
@@ -78,13 +78,13 @@ class ButterflyCapabilities(
spec_caps = 0
caps = contact.client_capabilities
- if caps.supports_sip_invite:
- gen_caps |= telepathy.CONNECTION_CAPABILITY_FLAG_CREATE
- gen_caps |= telepathy.CONNECTION_CAPABILITY_FLAG_INVITE
- spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_AUDIO
- spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN
+ #if caps.supports_sip_invite:
+ #gen_caps |= telepathy.CONNECTION_CAPABILITY_FLAG_CREATE
+ #gen_caps |= telepathy.CONNECTION_CAPABILITY_FLAG_INVITE
+ #spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_AUDIO
+ #spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN
- if caps.has_webcam:
- spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_VIDEO
+ #if caps.has_webcam:
+ #spec_caps |= telepathy.CHANNEL_MEDIA_CAPABILITY_VIDEO
return gen_caps, spec_caps
diff -urp telepathy-butterfly-0.5.3.orig/butterfly/connection.py telepathy-butterfly-0.5.3/butterfly/connection.py
--- telepathy-butterfly-0.5.3.orig/butterfly/connection.py 2009-10-25 03:35:38.000000000 -0400
+++ telepathy-butterfly-0.5.3/butterfly/connection.py 2009-11-21 14:17:27.799915606 -0500
@@ -296,27 +296,27 @@ class ButterflyConnection(telepathy.serv
# papyon.event.InviteEventInterface
def on_invite_conference(self, call):
- logger.debug("Call invite")
- handle = ButterflyHandleFactory(self, 'contact', call.peer.account,
- call.peer.network_id)
+ logger.debug("Call invite, ignoring it")
+ #handle = ButterflyHandleFactory(self, 'contact', call.peer.account,
+ # call.peer.network_id)
- props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
- handle, False, initiator_handle=handle)
+ #props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
+ # handle, False, initiator_handle=handle)
- channel = self._channel_manager.channel_for_props(props,
- signal=True, call=call)
+ #channel = self._channel_manager.channel_for_props(props,
+ # signal=True, call=call)
# papyon.event.InviteEventInterface
def on_invite_webcam(self, session, producer):
direction = (producer and "send") or "receive"
- logger.debug("Invitation to %s webcam" % direction)
+ logger.debug("Invitation to %s webcam, ignoring it" % direction)
- handle = ButterflyHandleFactory(self, 'contact', session.peer.account,
- session.peer.network_id)
- props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
- handle, False, initiator_handle=handle)
- channel = self._channel_manager.channel_for_props(props, signal=True,
- call=session)
+ #handle = ButterflyHandleFactory(self, 'contact', session.peer.account,
+ # session.peer.network_id)
+ #props = self._generate_props(telepathy.CHANNEL_TYPE_STREAMED_MEDIA,
+ # handle, False, initiator_handle=handle)
+ #channel = self._channel_manager.channel_for_props(props, signal=True,
+ # call=session)
# papyon.event.OfflineMessagesEventInterface
def on_oim_messages_received(self, messages):
Index: telepathy-butterfly.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-butterfly/F-12/telepathy-butterfly.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- telepathy-butterfly.spec 11 Nov 2009 21:55:04 -0000 1.19
+++ telepathy-butterfly.spec 8 Dec 2009 16:11:18 -0000 1.20
@@ -2,7 +2,7 @@
Name: telepathy-butterfly
Version: 0.5.3
-Release: 1%{?dist}
+Release: 2%{?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: %{name}-build.patch
+Patch1: %{name}-disable-av.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -32,6 +33,7 @@ and conversations
%prep
%setup -q
%patch0 -p1 -b .destdir
+%patch1 -p1 -b .av
%build
@@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-2
+- Add patch to disable audio-visual capabilities.
+
* Sun Oct 25 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.5.3-1
- Update to 0.5.3.
More information about the scm-commits
mailing list