summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert McNamara <rmcnamara@mythtv.org>2010-05-27 17:28:30 (GMT)
committer Robert McNamara <rmcnamara@mythtv.org>2010-05-27 17:28:30 (GMT)
commit6ff252dfe3da25c39378335c558ffb5022b85afe (patch)
tree0176a7fe9d5bf6a09996d4693582f680ab3f6970
parent856b0c7cb211aab3b7478b68c1c5230f4ac8ed03 (diff)
Internet Content: Patch from Doug Vaughan to allow a fallback directory icon when one is not specified.
git-svn-id: http://svn.mythtv.org/svn/trunk@24891 7dbf422c-18fa-0310-86e9-fd20926502f2
-rw-r--r--mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py2
-rw-r--r--mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py2
-rw-r--r--mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py2
-rw-r--r--mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py2
4 files changed, 8 insertions, 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
index 6acfc49..abbee2d 100644
--- 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 @@ class Videos(object):
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
index 84b5e21..249cdff 100644
--- 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 @@ class Videos(object):
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
index 68debf9..2800cc9 100644
--- 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 @@ class Videos(object):
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
index b1d322c..572e180 100644
--- 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 @@ class Videos(object):
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()