copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix messeage preview if USER_HAS_PYNOTIFY

This commit is contained in:
Stephan Erb 2007-07-12 22:19:21 +00:00
parent 294235ee52
commit 8c255eac60
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/notify.py
View File

@ -123,7 +123,6 @@ def notify(event, jid, account, parameters, advanced_notif_num = None):
do_popup = False do_popup = False
do_sound = False do_sound = False
do_cmd = False do_cmd = False
do_preview = True # defaults to true: do not reset emtpy text in new_message
if event == 'status_change': if event == 'status_change':
new_show = parameters[0] new_show = parameters[0]
status_message = parameters[1] status_message = parameters[1]
@ -158,7 +157,7 @@ def notify(event, jid, account, parameters, advanced_notif_num = None):
if gajim.config.get('notification_preview_message'): if gajim.config.get('notification_preview_message'):
message = parameters[3] message = parameters[3]
else: else:
do_preview = False # We don't want message preview, do_preview = False
message = '' message = ''
if helpers.allow_showing_notification(account, 'notify_on_new_message', if helpers.allow_showing_notification(account, 'notify_on_new_message',
advanced_notif_num, is_first_message): advanced_notif_num, is_first_message):
@ -240,7 +239,7 @@ def notify(event, jid, account, parameters, advanced_notif_num = None):
img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events',
'priv_msg_recv.png') 'priv_msg_recv.png')
title = _('New Private Message from group chat %s') % room_name title = _('New Private Message from group chat %s') % room_name
if do_preview: if message:
text = _('%(nickname)s: %(message)s') % {'nickname': nickname, text = _('%(nickname)s: %(message)s') % {'nickname': nickname,
'message': message} 'message': message}
else: else:
@ -308,7 +307,8 @@ def popup(event_type, jid, account, msg_type = '', path_to_image = None,
gajim.log.debug(str(e)) gajim.log.debug(str(e))
# we failed to speak to notification daemon via D-Bus # we failed to speak to notification daemon via D-Bus
if USER_HAS_PYNOTIFY: # try via libnotify if USER_HAS_PYNOTIFY: # try via libnotify
if not text and do_preview: if not text and event_type == 'new_message':
# empty text for new_message means do_preview = False
text = gajim.get_name_from_jid(account, jid) # default value of text text = gajim.get_name_from_jid(account, jid) # default value of text
if not title: if not title:
title = event_type title = event_type