From 782ae4c049e2b6fab13d7453cbb0e74610e7d200 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Fri, 12 Jan 2018 21:03:09 +0100 Subject: Move Jid class to xmpp-vala, partially refactor namespace --- xmpp-vala/src/module/xep/0030_service_discovery/module.vala | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'xmpp-vala/src/module/xep/0030_service_discovery/module.vala') diff --git a/xmpp-vala/src/module/xep/0030_service_discovery/module.vala b/xmpp-vala/src/module/xep/0030_service_discovery/module.vala index 011a1f36..2b955738 100644 --- a/xmpp-vala/src/module/xep/0030_service_discovery/module.vala +++ b/xmpp-vala/src/module/xep/0030_service_discovery/module.vala @@ -1,7 +1,5 @@ using Gee; -using Xmpp.Core; - namespace Xmpp.Xep.ServiceDiscovery { private const string NS_URI = "http://jabber.org/protocol/disco"; @@ -30,7 +28,7 @@ public class Module : XmppStreamModule, Iq.Handler { } public delegate void HasEntryCategoryRes(XmppStream stream, Gee.List? identities); - public void get_entity_categories(XmppStream stream, string jid, owned HasEntryCategoryRes listener) { + public void get_entity_categories(XmppStream stream, Jid jid, owned HasEntryCategoryRes listener) { Gee.List? res = stream.get_flag(Flag.IDENTITY).get_entity_categories(jid); if (res != null) listener(stream, res); request_info(stream, jid, (stream, query_result) => { @@ -39,7 +37,7 @@ public class Module : XmppStreamModule, Iq.Handler { } public delegate void OnInfoResult(XmppStream stream, InfoResult? query_result); - public void request_info(XmppStream stream, string jid, owned OnInfoResult listener) { + public void request_info(XmppStream stream, Jid jid, owned OnInfoResult listener) { Iq.Stanza iq = new Iq.Stanza.get(new StanzaNode.build("query", NS_URI_INFO).add_self_xmlns()); iq.to = jid; stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, (stream, iq) => { @@ -51,7 +49,7 @@ public class Module : XmppStreamModule, Iq.Handler { } public delegate void OnItemsResult(XmppStream stream, ItemsResult query_result); - public void request_items(XmppStream stream, string jid, owned OnItemsResult listener) { + public void request_items(XmppStream stream, Jid jid, owned OnItemsResult listener) { Iq.Stanza iq = new Iq.Stanza.get(new StanzaNode.build("query", NS_URI_ITEMS).add_self_xmlns()); iq.to = jid; stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, (stream, iq) => { -- cgit v1.2.3-54-g00ecf