From afaa90f91d56c2630ba6c83a15b6a6c2c9329a97 Mon Sep 17 00:00:00 2001
From: Thibaut GIRKA <thib@sitedethib.com>
Date: Tue, 1 Dec 2009 22:39:02 +0100
Subject: [PATCH] Rename FailedApplication to JingleContentSetupException

---
 src/common/jingle_content.py | 2 +-
 src/common/jingle_rtp.py     | 4 ++--
 src/common/jingle_session.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py
index ac7668c24..93fdf01b9 100644
--- a/src/common/jingle_content.py
+++ b/src/common/jingle_content.py
@@ -23,7 +23,7 @@ def get_jingle_content(node):
 		return contents[namespace](node)
 
 
-class FailedApplication(Exception):
+class JingleContentSetupException(Exception):
 	"""
 	Exception that should be raised when a content fails to setup.
 	"""
diff --git a/src/common/jingle_rtp.py b/src/common/jingle_rtp.py
index 70635e439..b97dc1d5f 100644
--- a/src/common/jingle_rtp.py
+++ b/src/common/jingle_rtp.py
@@ -24,7 +24,7 @@ from glib import GError
 import gajim
 
 from jingle_transport import JingleTransportICEUDP
-from jingle_content import contents, JingleContent, FailedApplication
+from jingle_content import contents, JingleContent, JingleContentSetupException
 
 
 class JingleRTPContent(JingleContent):
@@ -98,7 +98,7 @@ class JingleRTPContent(JingleContent):
 				(_("%s configuration error") % text.capitalize(),
 				_("Couldn't setup %s. Check your configuration.\n\nError was:\n%s")
 					% (text, error_str)))
-			raise FailedApplication
+			raise JingleContentSetupException
 
 	def add_remote_candidates(self, candidates):
 		JingleContent.add_remote_candidates(self, candidates)
diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py
index 57c70b3eb..0c8f7e9dc 100644
--- a/src/common/jingle_session.py
+++ b/src/common/jingle_session.py
@@ -29,7 +29,7 @@ Handles Jingle sessions (XEP 0166)
 import gajim #Get rid of that?
 import xmpp
 from jingle_transport import get_jingle_transport
-from jingle_content import get_jingle_content, FailedApplication
+from jingle_content import get_jingle_content, JingleContentSetupException
 
 # FIXME: Move it to JingleSession.States?
 class JingleStates(object):
@@ -492,7 +492,7 @@ class JingleSession(object):
 					else:
 						reasons.add('unsupported-transports')
 						contents_rejected.append((element['name'], 'peer'))
-				except FailedApplication:
+				except JingleContentSetupException:
 					reasons.add('failed-application')
 			else:
 				contents_rejected.append((element['name'], 'peer'))