summaryrefslogtreecommitdiffstats
path: root/telepathy-butterfly/remove-bad-import-from-im-module.patch
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2011-09-03 01:55:40 +0200
committerpiernov <piernov@piernov.org>2011-09-03 01:55:40 +0200
commit3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15 (patch)
tree31579afa03acc940fe9c5c42ccb341f160c26bd3 /telepathy-butterfly/remove-bad-import-from-im-module.patch
parent189aca5c7e2eb7833e215b83c199d823d05dc6ae (diff)
downloadgnome3-3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15.tar.gz
gnome3-3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15.tar.bz2
gnome3-3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15.tar.xz
gnome3-3688e18a4d7fa32f6fd8fdf144e1dc517cd1cc15.zip
telepathy-butterfly 0.5.15-1 ajout port
Diffstat (limited to 'telepathy-butterfly/remove-bad-import-from-im-module.patch')
-rw-r--r--telepathy-butterfly/remove-bad-import-from-im-module.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/telepathy-butterfly/remove-bad-import-from-im-module.patch b/telepathy-butterfly/remove-bad-import-from-im-module.patch
new file mode 100644
index 0000000..6580dcc
--- /dev/null
+++ b/telepathy-butterfly/remove-bad-import-from-im-module.patch
@@ -0,0 +1,26 @@
+From 501b46c364c5608d1b3b84dd48fe57abcabd4aea Mon Sep 17 00:00:00 2001
+From: Ionut Biru <ibiru@archlinux.org>
+Date: Mon, 6 Dec 2010 04:22:45 -0800
+Subject: [PATCH] bugfix: remove bad import from im module
+
+Signed-off-by: Ionut Biru <ibiru@archlinux.org>
+---
+ butterfly/channel/im.py | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py
+index 1781234..ac8dd44 100644
+--- a/butterfly/channel/im.py
++++ b/butterfly/channel/im.py
+@@ -30,8 +30,6 @@ import papyon.event
+
+ from butterfly.channel.text import ButterflyTextChannel
+
+-from butterfly.Channel_Interface_Conference import CHANNEL_INTERFACE_CONFERENCE
+-
+ __all__ = ['ButterflyImChannel']
+
+ logger = logging.getLogger('Butterfly.ImChannel')
+--
+1.7.3.2
+