← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/emesene/oneiric

« back to all changes in this revision

Viewing changes to emesene/gui/gtkui/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2011-03-19 13:47:22 UTC
  • mfrom: (1.1.10 upstream) (5.2.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110319134722-5yjs8aa0xbcbze37
Tags: 2.0~git20110319+dfsg-1
* Set myself as maintainer.
* New upstream git revision, tarball generated removing non-free dlls dir.
* Remove debian/watch, debian/emesene.xpm, debian/install files.
* Update debian/README.source file.
* Remove 21_svn2451_fix_avatar and 20_dont_build_own_libmimic patches.
* debian/control: modify python to python (>= 2.5) in Build-Depends field.
* debian/control: remove python-libmimic from Recommends field.
* debian/control: modify python-gtk2 (>= 2.10) to python-gtk2 (>= 2.12) in
  Depends field.
* debian/control: add python-appindicator and python-xmpp to Recommends
  field.
* debian/control: add python-papyon (>= 0.5.4) and python-webkit to Depends
  field.
* debian/control: update Description field.
* debian/control: add python-setuptools to Build-Depends field.
* debian/control: move python-dbus and python-notify to Depends field.
* Update debian/copyright file.
* Update debian/links file.
* debian/menu: update description field.
* Bump Standards-Version to 3.9.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
emesene/gui/gtkui/__init__.py
21
21
WEBKITERROR = False
22
22
INDICATORERROR = False
23
23
INFOBARERROR = False
 
24
PYNOTIFYERROR = False
24
25
 
25
26
def gtk_main(Controller):
26
27
    """ main method for gtk frontend
27
28
    """
28
 
    global WEBKITERROR, INDICATORERROR, INFOBARERROR
 
29
    global WEBKITERROR, INDICATORERROR, INFOBARERROR, PYNOTIFYERROR
29
30
 
30
31
    import gtk
31
32
    import gobject
48
49
    import FileTransferWidget
49
50
    import GroupMenu
50
51
    import GtkNotification
51
 
    import ThemeNotification
52
 
    import PyNotification
 
52
    try:
 
53
        import PyNotification
 
54
        import ThemeNotification
 
55
    except ImportError:
 
56
        PYNOTIFYERROR = True
 
57
 
53
58
    import Header
54
59
    import ImageAreaSelector
55
60
    import ImageChooser
108
113
    """
109
114
    define all the components for a gtk environment
110
115
    """
111
 
    global WEBKITERROR, INDICATORERROR, INFOBARERROR
 
116
    global WEBKITERROR, INDICATORERROR, INFOBARERROR, PYNOTIFYERROR
112
117
 
113
118
    import gtk
114
119
    gtk.settings_get_default().set_property("gtk-error-bell", False)
181
186
    else:
182
187
        extension.category_register('conversation output', TextBox.OutputText)
183
188
 
184
 
    extension.category_register(('notificationGUI'), ThemeNotification.themeNotification)
185
 
 
186
 
    extension.register(('notificationGUI'), PyNotification.pyNotification)
187
 
 
188
 
    extension.register(('notificationGUI'), GtkNotification.gtkNotification)
 
189
    if not PYNOTIFYERROR:
 
190
        extension.category_register(('notificationGUI'), ThemeNotification.themeNotification)
 
191
        extension.register(('notificationGUI'), PyNotification.pyNotification)
 
192
        extension.register(('notificationGUI'), GtkNotification.gtkNotification)
 
193
    else: #leave this here for Windows users!
 
194
        extension.category_register(('notificationGUI'), GtkNotification.gtkNotification)
189
195
    
190
196
    extension.category_register('picture handler', PictureHandler.PictureHandler)
191
197