gajim: fix exec commands and avatar in popups

changeset 7c1788ff05a9 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=7c1788ff05a9 description: fix exec commands and avatar in popups

diffstat:

src/common/helpers.py | 2 +- src/notify.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 034bc771bb38 -r 7c1788ff05a9 src/common/helpers.py --- a/src/common/helpers.py Sat Jan 05 15:55:30 2013 +0100 +++ b/src/common/helpers.py Sat Jan 05 20:08:07 2013 +0400 @@ -398,7 +398,7 @@ if use_shell: subprocess.Popen('%s &' % command, shell=True).wait() else: - args = shlex.split(command.encode('utf-8')) + args = shlex.split(command) p = subprocess.Popen(args) gajim.thread_interface(p.wait)

diff -r 034bc771bb38 -r 7c1788ff05a9 src/notify.py --- a/src/notify.py Sat Jan 05 15:55:30 2013 +0100 +++ b/src/notify.py Sat Jan 05 20:08:07 2013 +0400 @@ -157,8 +157,10 @@ def _nec_notification(self, obj): if obj.do_popup: if isinstance(obj.popup_image, str): - obj.popup_image = gtkgui_helpers.get_icon_path(obj.popup_image, + icon_path = gtkgui_helpers.get_icon_path(obj.popup_image, 48) + if icon_path: + obj.popup_image = icon_path popup(obj.popup_event_type, obj.jid, obj.conn.name, obj.popup_msg_type, path_to_image=obj.popup_image, title=obj.popup_title, text=obj.popup_text,