aboutsummaryrefslogtreecommitdiff
path: root/xmpp-vala
diff options
context:
space:
mode:
Diffstat (limited to 'xmpp-vala')
-rw-r--r--xmpp-vala/src/module/presence/module.vala12
-rw-r--r--xmpp-vala/src/module/roster/module.vala5
2 files changed, 5 insertions, 12 deletions
diff --git a/xmpp-vala/src/module/presence/module.vala b/xmpp-vala/src/module/presence/module.vala
index 2188d89d..4a9a72a3 100644
--- a/xmpp-vala/src/module/presence/module.vala
+++ b/xmpp-vala/src/module/presence/module.vala
@@ -15,13 +15,9 @@ namespace Xmpp.Presence {
public signal void received_subscription_request(XmppStream stream, Jid jid);
public signal void received_subscription_approval(XmppStream stream, Jid jid);
public signal void received_unsubscription(XmppStream stream, Jid jid);
- public signal void mutual_subscription(XmppStream stream, Jid jid);
public bool available_resource = true;
- private Gee.List<Jid> subscriptions = new ArrayList<Jid>(Jid.equals_bare_func);
- private Gee.List<Jid> subscribers = new ArrayList<Jid>(Jid.equals_bare_func);
-
public void request_subscription(XmppStream stream, Jid bare_jid) {
Presence.Stanza presence = new Presence.Stanza();
presence.to = bare_jid;
@@ -34,8 +30,6 @@ namespace Xmpp.Presence {
presence.to = bare_jid;
presence.type_ = Presence.Stanza.TYPE_SUBSCRIBED;
send_presence(stream, presence);
- subscribers.add(bare_jid);
- if (subscriptions.contains(bare_jid)) mutual_subscription(stream, bare_jid);
}
public void deny_subscription(XmppStream stream, Jid bare_jid) {
@@ -47,7 +41,6 @@ namespace Xmpp.Presence {
presence.to = bare_jid;
presence.type_ = Presence.Stanza.TYPE_UNSUBSCRIBED;
send_presence(stream, presence);
- subscribers.remove(bare_jid);
}
public void unsubscribe(XmppStream stream, Jid bare_jid) {
@@ -55,7 +48,6 @@ namespace Xmpp.Presence {
presence.to = bare_jid;
presence.type_ = Presence.Stanza.TYPE_UNSUBSCRIBE;
send_presence(stream, presence);
- subscriptions.remove(bare_jid);
}
public void send_presence(XmppStream stream, Presence.Stanza presence) {
@@ -92,16 +84,12 @@ namespace Xmpp.Presence {
break;
case Presence.Stanza.TYPE_SUBSCRIBED:
received_subscription_approval(stream, presence.from);
- subscriptions.add(presence.from);
- if (subscribers.contains(presence.from)) mutual_subscription(stream, presence.from);
break;
case Presence.Stanza.TYPE_UNSUBSCRIBE:
stream.get_flag(Flag.IDENTITY).remove_presence(presence.from);
received_unsubscription(stream, presence.from);
- subscribers.remove(presence.from);
break;
case Presence.Stanza.TYPE_UNSUBSCRIBED:
- subscriptions.remove(presence.from);
break;
}
}
diff --git a/xmpp-vala/src/module/roster/module.vala b/xmpp-vala/src/module/roster/module.vala
index 5b15a43a..2d36211d 100644
--- a/xmpp-vala/src/module/roster/module.vala
+++ b/xmpp-vala/src/module/roster/module.vala
@@ -11,6 +11,7 @@ public class Module : XmppStreamModule, Iq.Handler {
public signal void pre_get_roster(XmppStream stream, Iq.Stanza iq);
public signal void item_removed(XmppStream stream, Item item, Iq.Stanza iq);
public signal void item_updated(XmppStream stream, Item item, Iq.Stanza iq);
+ public signal void mutual_subscription(XmppStream stream, Jid jid);
public bool interested_resource = true;
@@ -55,8 +56,12 @@ public class Module : XmppStreamModule, Iq.Handler {
item_removed(stream, item, iq);
break;
default:
+ bool is_new = false;
+ Item old = flag.get_item(item.jid);
+ is_new = item.subscription == Item.SUBSCRIPTION_BOTH && (old == null || old.subscription == Item.SUBSCRIPTION_BOTH);
flag.roster_items[item.jid] = item;
item_updated(stream, item, iq);
+ if(is_new) mutual_subscription(stream, item.jid);
break;
}
}