Author: steve-e Date: 2007-07-13 00:19:21 +0200 (Fri, 13 Jul 2007) New Revision: 8392
Modified: trunk/src/notify.py Log: Fix messeage preview if USER_HAS_PYNOTIFY
Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2007-07-12 22:09:24 UTC (rev 8391) +++ trunk/src/notify.py 2007-07-12 22:19:21 UTC (rev 8392) @@ -123,7 +123,6 @@ do_popup = False do_sound = False do_cmd = False - do_preview = True # defaults to true: do not reset emtpy text in new_message if event == 'status_change': new_show = parameters[0] status_message = parameters[1] @@ -158,7 +157,7 @@ if gajim.config.get('notification_preview_message'): message = parameters[3] else: - do_preview = False + # We don't want message preview, do_preview = False message = '' if helpers.allow_showing_notification(account, 'notify_on_new_message', advanced_notif_num, is_first_message): @@ -240,7 +239,7 @@ img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', 'priv_msg_recv.png') title = _('New Private Message from group chat %s') % room_name - if do_preview: + if message: text = _('%(nickname)s: %(message)s') % {'nickname': nickname, 'message': message} else: @@ -308,7 +307,8 @@ gajim.log.debug(str(e)) # we failed to speak to notification daemon via D-Bus 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 if not title: title = event_type