Fix crash on NS_URI call when own server has no MAM; drop broken mam:1 "support"

fixes #1405

1 files changed, 3 insertions, 3 deletions

diff --git a/xmpp-vala/src/module/xep/0313_2_message_archive_management.vala b/xmpp-vala/src/module/xep/0313_2_message_archive_management.vala
index 3a6d9259..dde7d9b0 100644
--- a/xmpp-vala/src/module/xep/0313_2_message_archive_management.vala
+++ b/xmpp-vala/src/module/xep/0313_2_message_archive_management.vala
@@ -58,7 +58,7 @@ namespace Xmpp.MessageArchiveManagement.V2 {
             fields.add(field);
         }
 
-        return MessageArchiveManagement.create_base_query(stream, MessageArchiveManagement.NS_URI_2, mam_params.query_id, fields);
+        return MessageArchiveManagement.create_base_query(stream, mam_params.query_id, fields);
     }
 
     public async QueryResult query_archive(XmppStream stream, MamQueryParams mam_params, Cancellable? cancellable = null) {
@@ -67,14 +67,14 @@ namespace Xmpp.MessageArchiveManagement.V2 {
             query_node.put_node(ResultSetManagement.create_set_rsm_node_before(mam_params.end_id));
         }
 
-        return yield MessageArchiveManagement.query_archive(stream, MessageArchiveManagement.NS_URI_2, mam_params.mam_server, query_node, cancellable);
+        return yield MessageArchiveManagement.query_archive(stream, mam_params.mam_server, query_node, cancellable);
     }
 
     public async QueryResult page_through_results(XmppStream stream, MamQueryParams mam_params, QueryResult prev_result, Cancellable? cancellable = null) {
         var query_node = create_base_query(stream, mam_params);
         query_node.put_node(ResultSetManagement.create_set_rsm_node_before(prev_result.first));
 
-        return yield MessageArchiveManagement.query_archive(stream, MessageArchiveManagement.NS_URI_2, mam_params.mam_server, query_node, cancellable);
+        return yield MessageArchiveManagement.query_archive(stream, mam_params.mam_server, query_node, cancellable);
     }
 }