← Back to branch summary

~ubuntu-branches/ubuntu/hardy/emesene/hardy-updates

« back to all changes in this revision

Viewing changes to Theme.py

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2008-03-29 21:48:29 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080329214829-spbg3uej5aozf2c1
Tags: 1.0-dist-1
* New upstream stable release from the emesene-1.0-dist upstream tarball
  (which contains setup.py and misc/ ).
* debian/patches/01_setup_py_update_get_orig_source.patch:
  - Removed, not needed anymore as we aren't using get-orig-source.
* debian/rules:
  - Remove get-orig-source rule, as from now on we will use upstream
    tarballs.
  - Remove python-patchsys include.
  - Run dh_icons and dh_desktop
  - Build the package with python2.5 since it FTBFS with python2.4 due to
    an issue with distutils.
* debian/copyright:
  - Updated.
* debian/watch:
  - Updated so that it reports 1.* as the newer versions.
* debian/emesene-launcher:
  - Update for the new Controller.py location.
* debian/control:
  - Build-Depend on python2.5 since the package is built with python2.5,
    as it fails with python2.4's distutils.
  - Wrap Build-Depends.
  - Build-Depend on debhelper >= 5.0.51~ for dh_icons

Show diffs side-by-side

added added

removed removed

Lines of Context:
Theme.py
345
345
        else:
346
346
            return None
347
347
       
348
 
    def getBlockedImage( self, pixbuf ):
349
 
        '''Returns a new pixbuf with a composition of the given pixbuf and the
350
 
        theme's block image'''
351
 
        
352
 
        pixbuf = pixbuf.copy()
353
 
        blocked = self.getImage( 'blocked' )
354
 
        if blocked:
355
 
            blocked.composite( pixbuf, 0, 0, pixbuf.props.width, \
356
 
                          pixbuf.props.height, 0, 0, 1.0, 1.0, \
357
 
                          gtk.gdk.INTERP_BILINEAR, 255)
358
 
            return pixbuf
359
 
        else:
360
 
            # this is the unlikely case when there's no blocked image in
361
 
            # neither the current nor the default theme
362
 
            return pixbuf
363
 
        
364
348
    def hasUserDisplayPicture( self, contact ):
365
349
        '''return True if the user has a cached Display picture'''
366
350
        imagePath = os.path.join(self.config.getCachePath(), \
403
387
                    destname = os.path.join(spath, file)
404
388
                    if name in ('away','brb','busy','icon','idle','lunch', \
405
389
                                'invisible','mobile','offline','online', \
406
 
                                'phone','typing'):
 
390
                                'phone'):
407
391
                        pixbuf = resizePixbuf( gtk.gdk.pixbuf_new_from_file(fullname), 16, 16 )
408
392
                        pixbuf.save(destname, 'png')
409
393
                    elif file.split('.')[1] in ACCEPTED_FORMATS: