← Back to branch summary

~ubuntu-branches/ubuntu/utopic/radiotray/utopic

« back to all changes in this revision

Viewing changes to data/plugins/SleepTimerPlugin.py

  • Committer: Package Import Robot
  • Author(s): Julian Taylor
  • Date: 2013-05-09 21:24:43 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20130509212443-x1rgywggtb3bsorf
Tags: 0.7.3-1ubuntu1
https://launchpad.net/bugs/1156142
https://launchpad.net/bugs/972259
https://launchpad.net/bugs/972205
* Merge from Debian unstable. (LP: #1156142, #972259, #972205)
  Remaining changes:
  - patch config to use appindicator by default
  - depend on python-appindicator

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/plugins/SleepTimerPlugin.py
107
107
 
108
108
 
109
109
    def populate_tooltip(self):
110
 
        return _("sleep: %smin") % str(self.min_to_sleep)
 
110
        if self.sleep_timer_id != None:
 
111
            return _("Sleep: %smin") % str(self.min_to_sleep)
 
112
        else:
 
113
            return None
111
114
 
112
115
    def start_sleep_timer(self, interval, display_msg):
113
116
        self.sleep_timer_id = gobject.timeout_add(interval*60000, self.on_sleep_timer)