~ubuntu-branches/ubuntu/saucy/jockey/saucy-proposed

« back to all changes in this revision

Viewing changes to gtk/jockey-gtk

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2012-04-12 09:08:49 UTC
  • Revision ID: package-import@ubuntu.com-20120412090849-so3r4ju1tuo33ssq
Tags: 0.9.7-0ubuntu7
* debian/tests/control: Add dbus-x11 dependency to get dbus-launch.
  (LP: #976239)
* data/handlers/fglrx.py: Fix crash if there is no other alternative for the
  driver. (LP: #954297)
* Merge from trunk:
  - Fix crash if there is no notification daemon available. (LP: #819755)
  - jockey/detection.py: Do not show a warning about not being able to open
    the DriverDB cache if the file does not exist. (LP: #888273)
  - Update Bulgarian translations from Launchpad.

Show diffs side-by-side

added added

removed removed

Lines of Context:
206
206
        #if trayicon:
207
207
        #   notify.attach_to_status_icon(trayicon)
208
208
        notify.set_timeout(10000)
209
 
        notify.show()
 
209
        try:
 
210
            notify.show()
 
211
        except GLib.GError as e:
 
212
            sys.stderr.write('Failed to show notification: %s\n' % str(e))
210
213
 
211
214
    def ui_idle(self):
212
215
        '''Process pending UI events and return.