Show
Ignore:
Timestamp:
12/12/07 09:44:46 (12 months ago)
Author:
asterix
Message:

merge diff from trunk

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/pep/src/cell_renderer_image.py

    r7848 r9123  
    22## 
    33## Contributors for this file: 
    4 ## - Yann Le Boulanger <asterix@lagaule.org> 
     4## - Yann Leboulanger <asterix@lagaule.org> 
    55## - Nikos Kouremenos <kourem@gmail.com> 
    66## 
    7 ## Copyright (C) 2003-2004 Yann Le Boulanger <asterix@lagaule.org> 
     7## Copyright (C) 2003-2004 Yann Leboulanger <asterix@lagaule.org> 
    88##                         Vincent Hanquez <tab@snarc.org> 
    9 ## Copyright (C) 2005 Yann Le Boulanger <asterix@lagaule.org> 
     9## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org> 
    1010##                    Vincent Hanquez <tab@snarc.org> 
    1111##                    Nikos Kouremenos <kourem@gmail.com> 
     
    1414##                    Norman Rasmussen <norman@rasmussen.co.za> 
    1515## 
    16 ## This program is free software; you can redistribute it and/or modify 
     16## This file is part of Gajim. 
     17## 
     18## Gajim is free software; you can redistribute it and/or modify 
    1719## it under the terms of the GNU General Public License as published 
    18 ## by the Free Software Foundation; version 2 only. 
     20## by the Free Software Foundation; version 3 only. 
    1921## 
    20 ## This program is distributed in the hope that it will be useful, 
     22## Gajim is distributed in the hope that it will be useful, 
    2123## but WITHOUT ANY WARRANTY; without even the implied warranty of 
    2224## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    2325## GNU General Public License for more details. 
     26## 
     27## You should have received a copy of the GNU General Public License 
     28## along with Gajim.  If not, see <http://www.gnu.org/licenses/>. 
    2429## 
    2530 
     
    9095                if self.image.get_storage_type() == gtk.IMAGE_ANIMATION: 
    9196                        if self.image not in self.iters: 
     97                                if not isinstance(widget, gtk.TreeView): 
     98                                        return 
    9299                                animation = self.image.get_animation() 
    93100                                iter =  animation.get_iter()