Show
Ignore:
Timestamp:
12/20/06 07:58:39 (21 months ago)
Author:
asterix
Message:

merge diff from trunk

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/gajim_0.11/src/gtkgui_helpers.py

    r7595 r7701  
    356356        except gobject.GError: # 'unknown image format' 
    357357                pixbuf = None 
     358                if want_type: 
     359                        return None, None 
     360                else: 
     361                        return None 
    358362 
    359363        if want_type: