diff options
| author | Francesco Marella <francesco.marella@gmail.com> | 2010-06-06 14:39:50 +0200 |
|---|---|---|
| committer | Francesco Marella <francesco.marella@gmail.com> | 2010-06-06 14:39:50 +0200 |
| commit | 84501af9338e2fb4a0252e8990981085b197ab46 (patch) | |
| tree | 7bc9188d8bca56d0c8ee1313189c28df1dd64b38 /src | |
| parent | Add a check for appindicator's module import (diff) | |
| download | redshift-ng-84501af9338e2fb4a0252e8990981085b197ab46.tar.gz redshift-ng-84501af9338e2fb4a0252e8990981085b197ab46.tar.bz2 redshift-ng-84501af9338e2fb4a0252e8990981085b197ab46.tar.xz | |
rvert commit 103: Wrap in try...except only gtk.main.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtk-redshift/rsappindicator.py | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/gtk-redshift/rsappindicator.py b/src/gtk-redshift/rsappindicator.py index 42514e4..59fa725 100644 --- a/src/gtk-redshift/rsappindicator.py +++ b/src/gtk-redshift/rsappindicator.py @@ -46,46 +46,46 @@ def run(): args.insert(0, os.path.join(defs.BINDIR, 'redshift')) process = subprocess.Popen(args) - # Create status icon - indicator = appindicator.Indicator ("redshift", - "redshift", - appindicator.CATEGORY_APPLICATION_STATUS) - indicator.set_status (appindicator.STATUS_ACTIVE) + try: + # Create status icon + indicator = appindicator.Indicator ("redshift", + "redshift", + appindicator.CATEGORY_APPLICATION_STATUS) + indicator.set_status (appindicator.STATUS_ACTIVE) - def toggle_cb(widget, data=None): - if indicator.get_icon() == 'redshift': - indicator.set_icon('redshift-idle') - else: - indicator.set_icon('redshift') - process.send_signal(signal.SIGUSR1) + def toggle_cb(widget, data=None): + if indicator.get_icon() == 'redshift': + indicator.set_icon('redshift-idle') + else: + indicator.set_icon('redshift') + process.send_signal(signal.SIGUSR1) - def destroy_cb(widget, data=None): - gtk.main_quit() - return False + def destroy_cb(widget, data=None): + gtk.main_quit() + return False - # Create popup menu - status_menu = gtk.Menu() + # Create popup menu + status_menu = gtk.Menu() - toggle_item = gtk.ImageMenuItem(_('Toggle')) - toggle_item.connect('activate', toggle_cb) - status_menu.append(toggle_item) + toggle_item = gtk.ImageMenuItem(_('Toggle')) + toggle_item.connect('activate', toggle_cb) + status_menu.append(toggle_item) - quit_item = gtk.ImageMenuItem(gtk.STOCK_QUIT) - quit_item.connect('activate', destroy_cb) - status_menu.append(quit_item) + quit_item = gtk.ImageMenuItem(gtk.STOCK_QUIT) + quit_item.connect('activate', destroy_cb) + status_menu.append(quit_item) - status_menu.show_all() + status_menu.show_all() - # Set the menu - indicator.set_menu(status_menu) + # Set the menu + indicator.set_menu(status_menu) - def child_cb(pid, cond, data=None): - sys.exit(-1) + def child_cb(pid, cond, data=None): + sys.exit(-1) - # Add watch on child process - glib.child_watch_add(process.pid, child_cb) + # Add watch on child process + glib.child_watch_add(process.pid, child_cb) - try: # Run main loop gtk.main() |