From 39b0e8962abeaae7f4bc2f150e8ecf9e530bc26d Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Sat, 18 Jun 2005 14:57:25 +0000 Subject: [PATCH] fixing what we return also do not check not loading. the point is to refuse on adding or else we allow bugs --- src/gajim.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gajim.py b/src/gajim.py index 6892a7a0c..75b56e210 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -663,14 +663,11 @@ class Interface: try: img.set_from_file(image) except: - return True + return False if img.get_storage_type() == gtk.IMAGE_PIXBUF: pix = img.get_pixbuf() else: return False - if pix.get_width() > 24 or pix.get_height() > 24: - #FIXME: inform the user why you don't accept it - return False return True def make_regexps(self): @@ -713,7 +710,7 @@ class Interface: emoticons_pattern += emoticon_escaped + '|'# | means or in regexp emot_and_basic_pattern = emoticons_pattern + basic_pattern - self.emot_and_basic_re = sre.compile(emot_and_basic_pattern,\ + self.emot_and_basic_re = sre.compile(emot_and_basic_pattern, sre.IGNORECASE) # at least one character in 3 parts (before @, after @, after .)