diff -Nru mythbuntu-3rd-party-frontends-1/.bzr/branch/last-revision mythbuntu-3rd-party-frontends-1/.bzr/branch/last-revision --- mythbuntu-3rd-party-frontends-1/.bzr/branch/last-revision 2010-02-24 06:02:52.000000000 +0000 +++ mythbuntu-3rd-party-frontends-1/.bzr/branch/last-revision 2010-02-25 04:59:53.000000000 +0000 @@ -1 +1 @@ -1 tgm4883@gmail.com-20100224060247-5ujyv5cndn7f5xl3 +2 tgm4883@gmail.com-20100225045953-o1dnu34ufhv474l0 Binary files /tmp/Eqpn9Tt5P1/mythbuntu-3rd-party-frontends-1/.bzr/checkout/dirstate and /tmp/WnjjJzsHxZ/mythbuntu-3rd-party-frontends-1/.bzr/checkout/dirstate differ Binary files /tmp/Eqpn9Tt5P1/mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.cix and /tmp/WnjjJzsHxZ/mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.cix differ Binary files /tmp/Eqpn9Tt5P1/mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.iix and /tmp/WnjjJzsHxZ/mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.iix differ Binary files /tmp/Eqpn9Tt5P1/mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.rix and /tmp/WnjjJzsHxZ/mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.rix differ diff -Nru mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.six mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.six --- mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.six 1970-01-01 01:00:00.000000000 +0100 +++ mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.six 2010-02-25 04:59:53.000000000 +0000 @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= Binary files /tmp/Eqpn9Tt5P1/mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.tix and /tmp/WnjjJzsHxZ/mythbuntu-3rd-party-frontends-1/.bzr/repository/indices/149c1d0ae26da5b488445895d0e50c2f.tix differ Binary files /tmp/Eqpn9Tt5P1/mythbuntu-3rd-party-frontends-1/.bzr/repository/pack-names and /tmp/WnjjJzsHxZ/mythbuntu-3rd-party-frontends-1/.bzr/repository/pack-names differ Binary files /tmp/Eqpn9Tt5P1/mythbuntu-3rd-party-frontends-1/.bzr/repository/packs/149c1d0ae26da5b488445895d0e50c2f.pack and /tmp/WnjjJzsHxZ/mythbuntu-3rd-party-frontends-1/.bzr/repository/packs/149c1d0ae26da5b488445895d0e50c2f.pack differ diff -Nru mythbuntu-3rd-party-frontends-1/debian/changelog mythbuntu-3rd-party-frontends-1/debian/changelog --- mythbuntu-3rd-party-frontends-1/debian/changelog 2010-02-24 06:06:24.000000000 +0000 +++ mythbuntu-3rd-party-frontends-1/debian/changelog 2010-02-25 05:02:01.000000000 +0000 @@ -1,3 +1,9 @@ +mythbuntu-3rd-party-frontends (1-0ubuntu1+mythbuntu~karmic) karmic; urgency=low + + * Fixes LP:527356 + + -- Thomas Mashos Wed, 24 Feb 2010 20:59:10 -0800 + mythbuntu-3rd-party-frontends (1-0ubuntu0+mythbuntu~karmic) karmic; urgency=low * Initial release diff -Nru mythbuntu-3rd-party-frontends-1/plugins/python/3rd-party-frontends.py mythbuntu-3rd-party-frontends-1/plugins/python/3rd-party-frontends.py --- mythbuntu-3rd-party-frontends-1/plugins/python/3rd-party-frontends.py 2010-02-24 06:00:58.000000000 +0000 +++ mythbuntu-3rd-party-frontends-1/plugins/python/3rd-party-frontends.py 2010-02-25 04:57:34.000000000 +0000 @@ -33,6 +33,8 @@ #Load GUI & Calculate Changes # + HOME = os.environ['HOME'] + def __init__(self): #Initialize parent class information = {} @@ -41,19 +43,26 @@ information["ui"] = "tab_3rd-party-frontends" MCCPlugin.__init__(self,information) - HOME = os.environ['HOME'] - ## Get mythtv backend info - configdom = xml.dom.minidom.parse("/etc/mythtv/config.xml") - configTag=configdom.getElementsByTagName("DefaultBackend")[0] - DBHOST = configTag.getElementsByTagName("DBHostName")[0].childNodes[0].nodeValue - DBUSER = configTag.getElementsByTagName("DBUserName")[0].childNodes[0].nodeValue - DBPASS = configTag.getElementsByTagName("DBPassword")[0].childNodes[0].nodeValue + def getBackendInfo(self): + ## Get mythtv backend info + if os.path.exists(self.HOME+"/.mythtv/config.xml"): + self.warning_label.hide() + self.plugin_box.show() + configdom = xml.dom.minidom.parse(self.HOME+"/.mythtv/config.xml") + configTag=configdom.getElementsByTagName("DefaultBackend")[0] + DBHOST = configTag.getElementsByTagName("DBHostName")[0].childNodes[0].nodeValue + DBUSER = configTag.getElementsByTagName("DBUserName")[0].childNodes[0].nodeValue + DBPASS = configTag.getElementsByTagName("DBPassword")[0].childNodes[0].nodeValue + else: + self.warning_label.show() + self.plugin_box.hide() def captureState(self): """Determines the state of the items on managed by this plugin and stores it into the plugin's own internal structures""" import os + self.getBackendInfo() self.changes = {} self.changes['xbmcConfigured'] = self.xbmcConfigured() self.changes['xbmcAutostart'] = os.path.exists(self.HOME+'/.config/autostart/xbmc.desktop') diff -Nru mythbuntu-3rd-party-frontends-1/plugins/ui/tab_3rd-party-frontends.ui mythbuntu-3rd-party-frontends-1/plugins/ui/tab_3rd-party-frontends.ui --- mythbuntu-3rd-party-frontends-1/plugins/ui/tab_3rd-party-frontends.ui 2010-02-24 05:56:39.000000000 +0000 +++ mythbuntu-3rd-party-frontends-1/plugins/ui/tab_3rd-party-frontends.ui 2010-02-25 03:04:02.000000000 +0000 @@ -33,7 +33,7 @@ - + True vertical 10 @@ -247,15 +247,6 @@ - - - - - - - - - True 0 @@ -273,6 +264,15 @@ 2 + + + + + + + + + @@ -287,5 +287,15 @@ 2 + + + Warning: Config.xml not found. Please use the MySQL tab to configure the MythTV settings first. + center + True + + + 3 + +