diff --git a/common/hub.py b/common/hub.py
index 08357905a..ec058b8ed 100644
--- a/common/hub.py
+++ b/common/hub.py
@@ -56,7 +56,7 @@ class GajimHub:
""" Sends an event to registered plugins
NOTIFY : ('NOTIFY', (user, status, message))
MSG : ('MSG', (user, msg))
- ROSTER : ('ROSTER', {jid:{'Online':_, 'nom':_, 'server':_, 'resource':_, 'group':_, 'status':_, 'show':_} ,jid:{}})
+ ROSTER : ('ROSTER', {jid:{'status':_, 'name':_, 'show':_, 'groups':[], 'online':_, 'ask':_, 'sub':_} ,jid:{}})
SUBSCRIBED : ('SUBSCRIBED', {'jid':_, 'nom':_, 'server':_, 'resource':_, 'status':_, 'show':_})"""
if self.events.has_key(event):
diff --git a/core/core.py b/core/core.py
index d08ffd0a3..49b0d5f2c 100644
--- a/core/core.py
+++ b/core/core.py
@@ -69,8 +69,7 @@ class GajimCore:
#plein de trucs a faire
jid = prs.getFrom()
self.hub.sendPlugin('SUBSCRIBED', {'jid':jid.getBasic(), \
- 'nom':jid.getNode(), 'server':jid.getDomain(), \
- 'resource':jid.getResource()})
+ 'nom':jid.getNode()})
log.debug("we are now subscribed to %s" % who)
elif type == 'unsubscribe':
log.debug("unsubscribe request from %s" % who)
@@ -103,19 +102,25 @@ class GajimCore:
self.cfgParser.Profile_ressource):
self.con.requestRoster()
- roster = self.con.getRoster()
- tab_roster = {}
- for jid in roster.getJIDs():
- if roster.getShow(jid):
- show = roster.getShow(jid)
- else:
- show = roster.getOnline(jid)
- tab_roster[jid.getBasic()] = \
- {"Online":roster.getOnline(jid), "nom":jid.getNode(), \
- "server":jid.getDomain(), "resource":jid.getResource(), \
- "group":'general', "status":roster.getStatus(jid), \
- "show":show}
- self.hub.sendPlugin('ROSTER', tab_roster)
+ roster = self.con.getRoster().getRaw()
+ for jid in roster.keys():
+ if not roster[jid]['show']:
+ roster[jid]['show'] = roster[jid]['online']
+ if not roster[jid]['name']:
+ roster[jid]['name'] = ''
+ self.hub.sendPlugin('ROSTER', roster)
+# tab_roster = {}
+# for jid in roster.getJIDs():
+# if roster.getShow(jid):
+# show = roster.getShow(jid)
+# else:
+# show = roster.getOnline(jid)
+# tab_roster[jid.getBasic()] = \
+# {"Online":roster.getOnline(jid), "nom":jid.getNode(), \
+# "server":jid.getDomain(), "resource":jid.getResource(), \
+# "group":'general', "status":roster.getStatus(jid), \
+# "show":show}
+# self.hub.sendPlugin('ROSTER', tab_roster)
self.con.sendInitPresence()
self.connected = 1
else:
diff --git a/plugins/gtkgui.glade b/plugins/gtkgui.glade
index 18266492e..aa7e330aa 100644
--- a/plugins/gtkgui.glade
+++ b/plugins/gtkgui.glade
@@ -40,7 +40,7 @@
True
-
+
True
gtk-convert
1
@@ -55,23 +55,35 @@