~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to libs/libmythtv/cardutil.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, John Baab
  • Date: 2009-09-29 01:33:23 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20090929013323-6pvn8encm757zbxw
Tags: 0.22.0~trunk22101-0ubuntu1
[ Mario Limonciello ]
* New upstream checkout (r22101)
* Try to guard and make sure that ~mythtv is read from /etc/passwd 
  rather than assuming it's /home/mythtv.

[ John Baab ]
* debian/mythtv-common.postinst:
  - Added symlink for /home/mythtv/.mythtv/config.xml

Show diffs side-by-side

added added

removed removed

Lines of Context:
1992
1992
QString CardUtil::GetHDHRdesc(const QString &device)
1993
1993
{
1994
1994
    QString connectErr = QObject::tr("Unable to connect to device.");
1995
 
    (void) device;
1996
1995
 
1997
1996
#ifdef USING_HDHOMERUN
1998
1997
    bool      deviceIsIP = false;
2031
2030
        description += QObject::tr(", firmware: %2").arg(sVersion);
2032
2031
 
2033
2032
    return description;
2034
 
#endif
 
2033
#else
2035
2034
 
 
2035
    (void) device;
2036
2036
    return connectErr;
 
2037
#endif
2037
2038
}