Internet Content: Patch from Doug Vaughan to allow a fallback directo…

…ry icon when one is not specified. git-svn-id: http://svn.mythtv.org/svn/trunk@24891 7dbf422c-18fa-0310-86e9-fd20926502f2
MythTV · May 27, 2010 · 6ff252d · 6ff252d
1 parent 856b0c7
commit 6ff252d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
@@ -398,6 +398,8 @@ def setTreeViewIcon(self, dir_icon=None):
             if not self.feed_icons[self.tree_key].has_key(self.feed):
                 return self.tree_dir_icon
             dir_icon = self.feed_icons[self.tree_key][self.feed]
+            if not dir_icon:
+                return self.tree_dir_icon
         self.tree_dir_icon = u'%%SHAREDIR%%/mythnetvision/icons/%s.png' % (dir_icon, )
         return self.tree_dir_icon
     # end setTreeViewIcon()

diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py
@@ -686,6 +686,8 @@ def setTreeViewIcon(self, dir_icon=None):
             if not self.feed_icons[self.tree_key].has_key(self.feed):
                 return self.tree_dir_icon
             dir_icon = self.feed_icons[self.tree_key][self.feed]
+            if not dir_icon:
+                return self.tree_dir_icon
         self.tree_dir_icon = u'%%SHAREDIR%%/mythnetvision/icons/%s.png' % (dir_icon, )
         return self.tree_dir_icon
     # end setTreeViewIcon()

diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
@@ -334,6 +334,8 @@ def setTreeViewIcon(self, dir_icon=None):
             if not self.feed_icons[self.tree_key].has_key(self.feed):
                 return self.tree_dir_icon
             dir_icon = self.feed_icons[self.tree_key][self.feed]
+            if not dir_icon:
+                return self.tree_dir_icon
         self.tree_dir_icon = u'%%SHAREDIR%%/mythnetvision/icons/%s.png' % (dir_icon, )
         return self.tree_dir_icon
     # end setTreeViewIcon()

diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py
@@ -851,6 +851,8 @@ def setTreeViewIcon(self, dir_icon=None):
             if not self.feed_icons[self.tree_key].has_key(self.feed):
                 return self.tree_dir_icon
             dir_icon = self.feed_icons[self.tree_key][self.feed]
+            if not dir_icon:
+                return self.tree_dir_icon
         self.tree_dir_icon = u'%%SHAREDIR%%/mythnetvision/icons/%s.png' % (dir_icon, )
         return self.tree_dir_icon
     # end setTreeViewIcon()