← Back to branch summary

~ubuntu-branches/ubuntu/natty/mythtv/natty

« back to all changes in this revision

Viewing changes to libs/libmythui/xmlparsebase.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, Thomas Mashos
  • Date: 2010-06-20 00:11:00 UTC
  • mfrom: (1.1.53 upstream)
  • Revision ID: james.westby@ubuntu.com-20100620001100-yulpns6qg4ksmay6
Tags: 0.23.0+fixes25138-0ubuntu1
https://launchpad.net/bugs/581283
https://launchpad.net/bugs/556204
https://launchpad.net/bugs/574877
[ Mario Limonciello ]
* new upstream checkout (25138)

[ Thomas Mashos ]
* Added missingok for mirobridge log in logrotate (LP: #581283)
* Backend now waits for udev to finish (LP: #556204)
* Added patch to properly detect dbus during compile (LP: #574877)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythui/xmlparsebase.cpp
219
219
            if (parent->ParseElement(filename, info, showWarnings))
220
220
            {
221
221
            }
222
 
            else if (type == "font")
 
222
            else if (type == "font" || type == "fontdef")
223
223
            {
224
224
                bool global = (GetGlobalObjectStore() == parent);
225
225
                MythFontProperties *font = MythFontProperties::ParseFromXml(
405
405
            if (uitype->ParseElement(filename, info, showWarnings))
406
406
            {
407
407
            }
408
 
            else if (info.tagName() == "font")
 
408
            else if (info.tagName() == "font" || info.tagName() == "fontdef")
409
409
            {
410
410
                bool global = (GetGlobalObjectStore() == parent);
411
411
                MythFontProperties *font = MythFontProperties::ParseFromXml(
590
590
            if (!onlywindows)
591
591
            {
592
592
                QString type = e.tagName();
593
 
                if (type == "font")
 
593
                if (type == "font" || type == "fontdef")
594
594
                {
595
595
                    bool global = (GetGlobalObjectStore() == parent);
596
596
                    MythFontProperties *font = MythFontProperties::ParseFromXml(