← Back to branch summary

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

« back to all changes in this revision

Viewing changes to programs/mythwelcome/welcomedialog.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:
programs/mythwelcome/welcomedialog.cpp
312
312
    gContext->removeListener(this);
313
313
 
314
314
    if (m_updateStatusTimer)
315
 
        delete m_updateStatusTimer;
 
315
        m_updateStatusTimer->disconnect();
316
316
 
317
317
    if (m_updateScreenTimer)
318
 
        delete m_updateScreenTimer;
 
318
        m_updateScreenTimer->disconnect();
319
319
 
320
320
    if (m_timeTimer)
321
 
        delete m_timeTimer;
 
321
        m_timeTimer->disconnect();
322
322
}
323
323
 
324
324
void WelcomeDialog::updateTime(void)
736
736
 
737
737
    // run command to set wakeuptime in bios and shutdown the system
738
738
    QString mythshutdown_exe =
739
 
        "sudo " + m_installDir + "/bin/mythshutdown --startup";
 
739
        "sudo " + m_installDir + "/bin/mythshutdown --shutdown";
740
740
    myth_system(mythshutdown_exe);
741
741
}
742
742