Skip to content
Snippets Groups Projects
Commit 3238b6ad authored by nkour's avatar nkour
Browse files

various minor

parent 021afbf9
No related branches found
No related tags found
No related merge requests found
......@@ -21,6 +21,7 @@ src/gtkgui.glade.h
src/gtkgui_helpers.py
src/history_window.py
src/message_textview.py
src/notify.py
src/remote_control.py
src/roster_window.py
src/systray.py
......
......@@ -107,7 +107,7 @@ def _gen_agent_type_info():
# Category type to "human-readable" description string, and sort priority
_cat_to_descr = {
'other': (_('Others'), 2),
'other': (_('Others'), 2),
'gateway': (_('Transports'), 0),
'_jid': (_('Transports'), 0),
'conference': (_('Conference'), 1),
......
......@@ -544,7 +544,7 @@ _('Connection with peer cannot be established.'))
file_name = file_props['name']
text_props = gtkgui_helpers.escape_for_pango_markup(file_name) + '\n'
text_props += gtkgui_helpers.escape_for_pango_markup(contact.name)
self.model.set(iter, 1, text_labels, 2, text_props, C_SID, \
self.model.set(iter, 1, text_labels, 2, text_props, C_SID,
file_props['type'] + file_props['sid'])
self.set_progress(file_props['type'], file_props['sid'], 0, iter)
if file_props.has_key('started') and file_props['started'] is False:
......
......@@ -423,8 +423,7 @@ class Interface:
if not self.instances[account]['chats'].has_key(fjid) and \
not gajim.awaiting_events[account].has_key(fjid):
if show_notification:
notify.notify(
_('New Private Message'), fjid, account, 'pm')
notify.notify(_('New Private Message'), fjid, account, 'pm')
self.instances[account]['gc'][jid].on_private_message(jid, nick,
array[1], array[2])
......@@ -470,8 +469,7 @@ class Interface:
notify.notify(
_('New Single Message'), jid, account, msg_type)
else: # chat message
notify.notify(
_('New Message'), jid, account, msg_type)
notify.notify(_('New Message'), jid, account, msg_type)
# array : (contact, msg, time, encrypted, msg_type, subject)
self.roster.on_message(jid, array[1], array[2], account, array[3],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment