rhythmbox r5670 - in trunk: . plugins/coherence/upnp_coherence

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Apr  8 13:51:33 2008
New Revision: 5670
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5670&view=rev

Log:
2008-04-08  Jonathan Matthew  <jonathan d14n org>

	patch by: Frank Scholz  <dev netzflocken de>

	* plugins/coherence/upnp_coherence/__init__.py:
	initialize self.coherence in the constructor so deactivate() works
	when coherence init fails.  Fixes #514760.


Modified:
   trunk/ChangeLog
   trunk/plugins/coherence/upnp_coherence/__init__.py

Modified: trunk/plugins/coherence/upnp_coherence/__init__.py
==============================================================================
--- trunk/plugins/coherence/upnp_coherence/__init__.py	(original)
+++ trunk/plugins/coherence/upnp_coherence/__init__.py	Tue Apr  8 13:51:33 2008
@@ -14,6 +14,7 @@
 
     def __init__(self):
         rb.Plugin.__init__(self)
+        self.coherence = None
 
     def activate(self, shell):
         from twisted.internet import gtk2reactor
@@ -102,7 +103,7 @@
             source.delete_thyself()
         del self.sources
 
-        # uninstall twisted reactor? probably not, since other thigngs may have used it
+        # uninstall twisted reactor? probably not, since other things may have used it
 
 
     def get_coherence (self):