Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Kouremenos <kourem@gmail.com>2005-09-06 15:39:51 +0400
committerNikos Kouremenos <kourem@gmail.com>2005-09-06 15:39:51 +0400
commitf72e3d19571fc79556030aa40cc4e62d53418d13 (patch)
tree5c43cdc51c8c7b8a45636557932d20f2340658a9
parent1f1a49cb7b4ffb77bde9e8ffc2a10d6f01bd372c (diff)
filemanager fixes
-rw-r--r--src/config.py8
-rw-r--r--src/vcard.py9
2 files changed, 15 insertions, 2 deletions
diff --git a/src/config.py b/src/config.py
index abdf7106d..8f1670502 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1948,7 +1948,13 @@ class ManageEmoticonsWindow:
def update_preview(self, widget):
path_to_file = widget.get_preview_filename()
- widget.get_preview_widget().set_from_file(path_to_file)
+ if os.path.isdir(path_to_file):
+ return
+ try:
+ pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(path_to_file, 32, 32)
+ except (gobject.GError, TypeError):
+ return
+ widget.get_preview_widget().set_from_pixbuf(pixbuf)
def on_set_image_button_clicked(self, widget, data=None):
(model, iter) = self.emot_tree.get_selection().get_selected()
diff --git a/src/vcard.py b/src/vcard.py
index 143d6622e..2c9b9e74d 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -19,6 +19,7 @@
import gtk
import gtk.glade
+import gobject
import urllib
import base64
import mimetypes
@@ -120,7 +121,13 @@ class VcardWindow:
def update_preview(self, widget):
path_to_file = widget.get_preview_filename()
- widget.get_preview_widget().set_from_file(path_to_file)
+ if os.path.isdir(path_to_file):
+ return
+ try:
+ pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(path_to_file, 100, 100)
+ except gobject.GError:
+ return
+ widget.get_preview_widget().set_from_pixbuf(pixbuf)
def on_set_avatar_button_clicked(self, widget):
f = None