changeset f6fa329a5295 in /home/hg/repos/gajim-plugins
author: Denis Fomin <[email protected]>
branches:
details:gajim-plugins?cmd=changeset;node=f6fa329a5295
description: ClientsIconsPlugin. Fix Adium and Pidgin detection.
diffstat:
clients_icons/clients_icons.py | 31 +++----------------------------
clients_icons/manifest.ini | 2 +-
2 файлов изменено, 4 вставок(+), 29 удалений(-)
различия (89 строк):
diff -r e0c3177c3021 -r f6fa329a5295 clients_icons/clients_icons.py
--- a/clients_icons/clients_icons.py Fri Dec 06 11:10:16 2013 +0400
+++ b/clients_icons/clients_icons.py Thu Dec 19 00:00:23 2013 +0400
@@ -31,8 +31,6 @@
'http://talkgadget.google.com/client/caps': ['google.png', 'GTalk'],
'http://oneteam.im/caps': ['oneteamiphone.png', 'OneTeam'],
'http://tkabber.jabber.ru/': ['tkabber.png', 'Tkabber'],
- 'http://pidgin.im/': ['pidgin.png', 'Pidgin'],
- 'http://pidgin.im/caps': ['pidgin.png', 'Pidgin'],
'http://qutim.org': ['qutim.png', 'QutIM'],
'http://qutim.org/': ['qutim.png', 'QutIM'],
'http://exodus.jabberstudio.org/caps': ['exodus.png', 'Exodus'],
@@ -133,7 +131,6 @@
'http://gabber.sourceforge.net': ['gabber.png', 'Gabber'],
'http://megafonvolga.ru/': ['megafon.png', 'Megafon'],
'[email protected]': ['osiris.png', 'Osiris'],
- 'libpurple': ['libpurple.png', 'Libpurple'],
'http://www.adium.im/': ['adium.png', 'Adium'],
'http://eqo.com/': ['libpurple.png', 'Eqo'],
'http://instantbird.com/': ['instantbird.png', 'Instantbird'],
@@ -150,18 +147,10 @@
'mcabber' :['mcabber.png', ''],
'yaxim' :['yaxim.png', ''],
'Xabber' :['xabber.png', ''],
+ 'Adium' :['adium.png', ''],
+ 'Pidgin': ['pidgin.png', ''],
}
-libpurple_clients ={
- 'adium': 'http://www.adium.im/',
- 'eqo': 'http://eqo.com/',
- 'finch': 'http://pidgin.im/',
- 'instantbird': 'http://instantbird.com/',
- 'meebo': 'https://www.meebo.com/',
- 'palm': 'http://opensource.palm.com/packages.html',
- 'pidgin': 'http://pidgin.im/',
- 'spectrum': 'http://spectrum.im/',
- 'telepathy-haze': 'http://pidgin.im/'
-}
+
class ClientsIconsPlugin(GajimPlugin):
@@ -320,12 +309,6 @@
if not caps:
return gtk.image_new_from_pixbuf(self.default_pixbuf), _('Unknown')
- if 'pidgin.im/' in caps:
- caps = 'libpurple'
- for client in libpurple_clients:
- if client in contact.resource.lower():
- caps = libpurple_clients[client]
-
caps_from_jid = self.check_jid(contact.jid)
if caps_from_jid:
caps = caps_from_jid
@@ -586,12 +569,6 @@
tag = iq_obj.stanza.getTags('c')
if tag:
caps = tag[0].getAttr('node')
- if caps:
- if 'pidgin.im/' in caps:
- caps = 'libpurple'
- for client in libpurple_clients:
- if client in contact.resource.lower():
- caps = libpurple_clients[client]
caps_from_jid = self.check_jid(iq_obj.jid)
if caps_from_jid:
@@ -608,8 +585,6 @@
tag = iq_obj.stanza.getTags('c')
if tag:
caps = tag[0].getAttr('node')
- if 'pidgin.im/' in caps:
- caps = 'libpurple'
gc_control = gajim.interface.msg_win_mgr.get_gc_control(iq_obj.jid,
iq_obj.conn.name)
diff -r e0c3177c3021 -r f6fa329a5295 clients_icons/manifest.ini
--- a/clients_icons/manifest.ini Fri Dec 06 11:10:16 2013 +0400
+++ b/clients_icons/manifest.ini Thu Dec 19 00:00:23 2013 +0400
@@ -1,7 +1,7 @@
[info]
name: Clients icons
short_name: clients_icons
-version: 5.1
+version: 5.2
description: Shows the client icons in the roster and in groupchats.
authors: Denis Fomin <[email protected]>
Artem Klyop <[email protected]>
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
