[totem] plugins: Ensure all attributes are declared in __init__ methods

[Philip Withnall <pwithnall src gnome org>]

commit 916484b28dc4e72b9efe30a8486e50f59f9b56e3
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Mar 27 13:28:28 2011 +0100

    plugins: Ensure all attributes are declared in __init__ methods
    
    Continuing to shut pylint upâ?¦
    
    Helps: bgo#645739

 src/plugins/dbus-service/dbus-service.py   |    5 +++++
 src/plugins/iplayer/iplayer.py             |    3 +++
 src/plugins/iplayer/iplayer2.py            |   15 +++++++++++++--
 src/plugins/jamendo/jamendo.py             |   18 ++++++++++++++++++
 src/plugins/opensubtitles/opensubtitles.py |   25 +++++++++++++++++++++----
 5 files changed, 60 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/dbus-service/dbus-service.py b/src/plugins/dbus-service/dbus-service.py
index ffa183f..3550616 100644
--- a/src/plugins/dbus-service/dbus-service.py
+++ b/src/plugins/dbus-service/dbus-service.py
@@ -31,6 +31,11 @@ class DbusService (gobject.GObject, Peas.Activatable):
 
     object = gobject.property (type = gobject.GObject)
 
+    def __init__ (self):
+        self.root = None
+        self.player = None
+        self.track_list = None
+
     def do_activate (self):
         DBusGMainLoop (set_as_default = True)
 
diff --git a/src/plugins/iplayer/iplayer.py b/src/plugins/iplayer/iplayer.py
index fcb4d5f..140bca8 100644
--- a/src/plugins/iplayer/iplayer.py
+++ b/src/plugins/iplayer/iplayer.py
@@ -22,6 +22,9 @@ class IplayerPlugin (gobject.GObject, Peas.Activatable):
         self.totem = None
         self.programme_download_lock = threading.Lock ()
 
+        self.tv_feed = None
+        self.tv_tree_store = None
+
     def do_activate (self):
         self.totem = self.object
         # Build the interface
diff --git a/src/plugins/iplayer/iplayer2.py b/src/plugins/iplayer/iplayer2.py
index 41aa456..4f004c9 100644
--- a/src/plugins/iplayer/iplayer2.py
+++ b/src/plugins/iplayer/iplayer2.py
@@ -359,6 +359,15 @@ class Media (object):
         self.width, self.height = None, None
         self.read_media_node (media_node)
 
+        self.mimetype = None
+        self.encoding = None
+        self.live = False
+        self.connection_href = None
+        self.connection_protocol = None
+        self.connection_method = None
+        self.connection_kind = None
+        self.connection_live = False
+
     @property
     def url (self):
         if self.connection_method == 'resolve':
@@ -467,6 +476,9 @@ class Item (object):
         self.alternate = None
         self.duration = ''
         self.medias = None
+        self.group = None
+        self.kind = None
+        self.live = False
         self.read_item_node (item_node)
 
     def read_item_node (self, node):
@@ -816,8 +828,7 @@ class Feed (object):
                 self.tvradio = 'radio'
             else:
                 raise Exception, "TV channel '%s' not "\
-                                 "recognised." % self.channel
-
+                                 "recognised." % channel
         elif tvradio in ['tv', 'radio']:
             self.tvradio = tvradio
         else:
diff --git a/src/plugins/jamendo/jamendo.py b/src/plugins/jamendo/jamendo.py
index 70b0657..ad909c4 100644
--- a/src/plugins/jamendo/jamendo.py
+++ b/src/plugins/jamendo/jamendo.py
@@ -95,6 +95,24 @@ class JamendoPlugin (gobject.GObject, Peas.Activatable, PeasGtk.Configurable):
         self.settings.connect ('changed::num-per-page',
                                self.on_num_per_page_changed)
 
+        self.search_entry = None
+        self.search_combo = None
+        self.next_button = None
+        self.previous_button = None
+        self.album_button = None
+
+        self.treeviews = None
+        self.current_treeview = None
+        self.popup = None
+
+        self.notebook = None
+        self.pages = None
+        self.current_page = None
+        self.progressbars = None
+
+        self.album_count = None
+        self.running_threads = None
+
     def do_activate (self):
         """
         Plugin activation.
diff --git a/src/plugins/opensubtitles/opensubtitles.py b/src/plugins/opensubtitles/opensubtitles.py
index 1310f09..fa3de18 100644
--- a/src/plugins/opensubtitles/opensubtitles.py
+++ b/src/plugins/opensubtitles/opensubtitles.py
@@ -314,6 +314,23 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
         schema = 'org.gnome.totem.plugins.opensubtitles'
         self.settings = Gio.Settings.new (schema)
 
+        self.manager = None
+        self.menu_id = None
+        self.action_group = None
+        self.action = None
+
+        self.find_button = None
+        self.apply_button = None
+        self.close_button = None
+
+        self.liststore = None
+        self.model = None
+        self.treeview = None
+
+        self.results = None
+        self.filename = None
+        self.progress = None
+
     # totem.Plugin methods
 
     def do_activate (self):
@@ -436,7 +453,7 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
         """
         """
 
-        self.os_action_group = Gtk.ActionGroup (name='OpenSubtitles')
+        self.action_group = Gtk.ActionGroup (name='OpenSubtitles')
 
         tooltip_text = _(u"Download movie subtitles from OpenSubtitles")
         self.action = Gtk.Action (name='opensubtitles',
@@ -444,9 +461,9 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
                                  tooltip=tooltip_text,
                                  stock_id=None)
 
-        self.os_action_group.add_action (self.action)
+        self.action_group.add_action (self.action)
 
-        self.manager.insert_action_group (self.os_action_group, 0)
+        self.manager.insert_action_group (self.action_group, 0)
 
         self.menu_id = self.manager.new_merge_id ()
         merge_path = '/tmw-menubar/view/subtitles/subtitle-download-placeholder'
@@ -487,7 +504,7 @@ class OpenSubtitles (gobject.GObject, Peas.Activatable):
         return False
 
     def os_delete_menu (self):
-        self.manager.remove_action_group (self.os_action_group)
+        self.manager.remove_action_group (self.action_group)
         self.manager.remove_ui (self.menu_id)
 
     def os_get_results (self):