diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2018-02-22 22:22:44 -0600 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2018-02-22 22:22:44 -0600 |
| commit | 6eb5316aaf1caab4cd5db1023ac142d5d0ab56de (patch) | |
| tree | 037253e16f8b9c737d05d2b0bf7077157ff3ecb1 | |
| parent | 3bf945ee6b91f2596a5224d02c635564d1a2ab33 (diff) | |
| download | pidgin-6eb5316aaf1caab4cd5db1023ac142d5d0ab56de.tar.gz | |
Fix the build
| -rw-r--r-- | finch/meson.build | 1 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/auth.h | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/auth_webex.c | 18 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/meson.build | 1 | ||||
| -rw-r--r-- | pidgin/meson.build | 1 |
5 files changed, 12 insertions, 11 deletions
diff --git a/finch/meson.build b/finch/meson.build index 69fbe85298..d927133515 100644 --- a/finch/meson.build +++ b/finch/meson.build @@ -112,6 +112,7 @@ if enable_consoleui export_packages : 'finch', nsversion : '@0@.@1@'.format(purple_major_version, purple_minor_version), + link_with: [libpurple], install : true) endif diff --git a/libpurple/protocols/jabber/auth.h b/libpurple/protocols/jabber/auth.h index c44167036a..57d36fc047 100644 --- a/libpurple/protocols/jabber/auth.h +++ b/libpurple/protocols/jabber/auth.h @@ -57,9 +57,7 @@ JabberSaslMech **jabber_auth_get_scram_mechs(gint *count); #ifdef HAVE_CYRUS_SASL JabberSaslMech *jabber_auth_get_cyrus_mech(void); #endif -#ifdef HAVE_WEBEX_TOKEN JabberSaslMech *jabber_auth_get_webex_token_mech(void); -#endif void jabber_auth_add_mech(JabberSaslMech *); void jabber_auth_remove_mech(JabberSaslMech *); diff --git a/libpurple/protocols/jabber/auth_webex.c b/libpurple/protocols/jabber/auth_webex.c index 2bb7af12ba..6516ed274d 100644 --- a/libpurple/protocols/jabber/auth_webex.c +++ b/libpurple/protocols/jabber/auth_webex.c @@ -31,24 +31,24 @@ #include "jabber.h" #include "auth.h" -static xmlnode *finish_webex_authentication(JabberStream *js) +static PurpleXmlNode *finish_webex_authentication(JabberStream *js) { - xmlnode *auth; + PurpleXmlNode *auth; - auth = xmlnode_new("auth"); - xmlnode_set_namespace(auth, NS_XMPP_SASL); + auth = purple_xmlnode_new("auth"); + purple_xmlnode_set_namespace(auth, NS_XMPP_SASL); - xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); - xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); + purple_xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); + purple_xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); - xmlnode_set_attrib(auth, "mechanism", "WEBEX-TOKEN"); - xmlnode_insert_data(auth, purple_connection_get_password(js->gc), -1); + purple_xmlnode_set_attrib(auth, "mechanism", "WEBEX-TOKEN"); + purple_xmlnode_insert_data(auth, purple_connection_get_password(js->gc), -1); return auth; } static JabberSaslState -jabber_webex_start(JabberStream *js, xmlnode *packet, xmlnode **response, char **error) +jabber_webex_start(JabberStream *js, PurpleXmlNode *packet, PurpleXmlNode **response, char **error) { *response = finish_webex_authentication(js); return JABBER_SASL_STATE_OK; diff --git a/libpurple/protocols/jabber/meson.build b/libpurple/protocols/jabber/meson.build index 5fc9c635fd..48b9171af4 100644 --- a/libpurple/protocols/jabber/meson.build +++ b/libpurple/protocols/jabber/meson.build @@ -8,6 +8,7 @@ JABBERSOURCES = [ 'auth_plain.c', 'auth_scram.c', 'auth_scram.h', + 'auth_webex.c', 'buddy.c', 'buddy.h', 'bosh.c', diff --git a/pidgin/meson.build b/pidgin/meson.build index 198ccc47cb..3c8417b8e7 100644 --- a/pidgin/meson.build +++ b/pidgin/meson.build @@ -232,6 +232,7 @@ if ENABLE_GTK export_packages : 'pidgin-@0@'.format(purple_major_version), nsversion : '@0@.@1@'.format(purple_major_version, purple_minor_version), + link_with : [libpurple], install : true) endif |