Author: asterix Date: 2008-07-10 14:18:26 +0200 (Thu, 10 Jul 2008) New Revision: 9904

Added: trunk/data/iconsets/transports/mrim/ trunk/data/iconsets/transports/mrim/16x16/ trunk/data/iconsets/transports/mrim/16x16/away.png trunk/data/iconsets/transports/mrim/16x16/chat.png trunk/data/iconsets/transports/mrim/16x16/dnd.png trunk/data/iconsets/transports/mrim/16x16/not_in_roster.png trunk/data/iconsets/transports/mrim/16x16/offline.png trunk/data/iconsets/transports/mrim/16x16/online.png trunk/data/iconsets/transports/mrim/16x16/xa.png trunk/data/iconsets/transports/mrim/32x32/ trunk/data/iconsets/transports/mrim/32x32/away.png trunk/data/iconsets/transports/mrim/32x32/chat.png trunk/data/iconsets/transports/mrim/32x32/dnd.png trunk/data/iconsets/transports/mrim/32x32/not_in_roster.png trunk/data/iconsets/transports/mrim/32x32/offline.png trunk/data/iconsets/transports/mrim/32x32/online.png trunk/data/iconsets/transports/mrim/32x32/xa.png trunk/data/iconsets/transports/mrim/48x48/ trunk/data/iconsets/transports/mrim/48x48/offline.png trunk/data/iconsets/transports/mrim/48x48/online.png Modified: trunk/src/common/gajim.py trunk/src/common/logger.py trunk/src/disco.py Log: add mrim transport icons. Fixes #4078

Added: trunk/data/iconsets/transports/mrim/16x16/away.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/16x16/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/16x16/chat.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/16x16/chat.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/16x16/dnd.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/16x16/dnd.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/16x16/not_in_roster.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/16x16/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/16x16/offline.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/16x16/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/16x16/online.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/16x16/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/16x16/xa.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/16x16/xa.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/32x32/away.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/32x32/away.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/32x32/chat.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/32x32/chat.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/32x32/dnd.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/32x32/dnd.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/32x32/not_in_roster.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/32x32/not_in_roster.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/32x32/offline.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/32x32/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/32x32/online.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/32x32/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/32x32/xa.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/32x32/xa.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/48x48/offline.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/48x48/offline.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Added: trunk/data/iconsets/transports/mrim/48x48/online.png =================================================================== (Binary files differ)

Property changes on: trunk/data/iconsets/transports/mrim/48x48/online.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-07-09 03:10:50 UTC (rev 9903) +++ trunk/src/common/gajim.py 2008-07-10 12:18:26 UTC (rev 9904) @@ -323,7 +323,8 @@ # now we support both 'icq.' and 'icq' but not icqsucks.org host = host_splitted[0]

- if host in ('aim', 'irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo'): + if host in ('aim', 'irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo', + 'mrim'): return host elif host == 'gg': return 'gadu-gadu'

Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-07-09 03:10:50 UTC (rev 9903) +++ trunk/src/common/logger.py 2008-07-10 12:18:26 UTC (rev 9904) @@ -83,7 +83,8 @@ self.TYPE_NEWMAIL, self.TYPE_RSS, self.TYPE_WEATHER, - ) = range(13) + self.TYPE_MRIM, + ) = range(14)

constants = Constants()

@@ -290,6 +291,8 @@ return constants.TYPE_RSS if type_ == 'weather': return constants.TYPE_WEATHER + if type_ == 'mrim': + return constants.TYPE_MRIM return None

def convert_api_values_to_human_transport_type(self, type_id): @@ -320,6 +323,8 @@ return 'rss' if type_id == constants.TYPE_WEATHER: return 'weather' + if type_id == constants.TYPE_MRIM: + return 'mrim'

def commit_to_db(self, values, write_unread = False): sql = 'INSERT INTO logs (jid_id, contact_name, time, kind, show, message, subject) VALUES (?, ?, ?, ?, ?, ?, ?)'

Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-07-09 03:10:50 UTC (rev 9903) +++ trunk/src/disco.py 2008-07-10 12:18:26 UTC (rev 9904) @@ -103,6 +103,8 @@ ('gateway', 'smtp'): (False, 'mail.png'), ('gateway', 'yahoo'): (False, 'yahoo.png'), ('_jid', 'yahoo'): (False, 'yahoo.png'), + ('gateway', 'mrim'): (False, 'mrim.png'), + ('_jid', 'mrim'): (False, 'mrim.png'), }

# Category type to "human-readable" description string, and sort priority