guile: Remove the deprecated priority API.

* guile/modules/gnutls/build/priorities.scm: Remove.
* guile/src/make-session-priorities.scm: Remove.
* guile/modules/Makefile.am (EXTRA_DIST): Adjust accordingly.
* guile/src/Makefile.am (EXTRA_DIST): Likewise.
  (GENERATED_BINDINGS): Remove 'priorities.i.c'.
  (priorities.i.c): Remove target.
* guile/src/core.c: Don't include it.
  (scm_gnutls_set_default_priority_x): Remove.
* guile/modules/gnutls.in (gnutls): Adjust export list.
* guile/tests/session-record-port.scm: Use 'set-session-priorities!'.
* guile/tests/x509-auth.scm: Likewise.

3 files changed, 3 insertions, 69 deletions

diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index 40ff26559e..21efaa4e53 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -1,5 +1,5 @@
 #  GnuTLS --- Guile bindings for GnuTLS.
-#  Copyright (C) 2007-2013 Free Software Foundation, Inc.
+#  Copyright (C) 2007-2014 Free Software Foundation, Inc.
 #
 #  GnuTLS is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -22,13 +22,11 @@ noinst_HEADERS = errors.h utils.h
 
 EXTRA_DIST =					\
   make-enum-map.scm make-smob-types.scm		\
-  make-enum-header.scm make-smob-header.scm	\
-  make-session-priorities.scm
+  make-enum-header.scm make-smob-header.scm
 
 # Files generated by the (gnutls build ...) modules.
 GENERATED_BINDINGS =				\
-  enum-map.i.c smob-types.i.c enums.h smobs.h	\
-  priorities.i.c
+  enum-map.i.c smob-types.i.c enums.h smobs.h
 
 BUILT_SOURCES =					\
   $(GENERATED_BINDINGS)				\
@@ -95,10 +93,6 @@ smob-types.i.c: $(srcdir)/make-smob-types.scm
 	$(GUILE_FOR_BUILD) "$^" > "$@.tmp"
 	mv "$@.tmp" "$@"
 
-priorities.i.c: $(srcdir)/make-session-priorities.scm
-	$(GUILE_FOR_BUILD) "$^" > "$@.tmp"
-	mv "$@.tmp" "$@"
-
 
 # C file snarfing.
 
diff --git a/guile/src/core.c b/guile/src/core.c
index 9668b22312..dc1ae862ac 100644
--- a/guile/src/core.c
+++ b/guile/src/core.c
@@ -516,8 +516,6 @@ SCM_DEFINE (scm_gnutls_set_server_session_certificate_request_x,
 
 /* Choice of a protocol and cipher suite.  */
 
-#include "priorities.i.c"
-
 SCM_DEFINE (scm_gnutls_set_default_priority_x,
             "set-session-default-priority!", 1, 0, 0,
             (SCM session), "Have @var{session} use the default priorities.")
@@ -533,21 +531,6 @@ SCM_DEFINE (scm_gnutls_set_default_priority_x,
 
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_gnutls_set_default_export_priority_x,
-            "set-session-default-export-priority!", 1, 0, 0,
-            (SCM session),
-            "Have @var{session} use the default export priorities.")
-#define FUNC_NAME s_scm_gnutls_set_default_export_priority_x
-{
-  gnutls_session_t c_session;
-
-  c_session = scm_to_gnutls_session (session, 1, FUNC_NAME);
-  gnutls_set_default_export_priority (c_session);
-
-  return SCM_UNSPECIFIED;
-}
-#undef FUNC_NAME
-
 SCM_DEFINE (scm_gnutls_set_session_priorities_x,
 	    "set-session-priorities!", 2, 0, 0,
 	    (SCM session, SCM priorities),
diff --git a/guile/src/make-session-priorities.scm b/guile/src/make-session-priorities.scm
deleted file mode 100644
index 1bc5edcdad..0000000000
--- a/guile/src/make-session-priorities.scm
+++ /dev/null
@@ -1,43 +0,0 @@
-;;; Help produce Guile wrappers for GnuTLS types.
-;;;
-;;; GnuTLS --- Guile bindings for GnuTLS.
-;;; Copyright (C) 2007, 2010, 2012 Free Software Foundation, Inc.
-;;;
-;;; GnuTLS is free software; you can redistribute it and/or
-;;; modify it under the terms of the GNU Lesser General Public
-;;; License as published by the Free Software Foundation; either
-;;; version 2.1 of the License, or (at your option) any later version.
-;;;
-;;; GnuTLS is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Lesser General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GnuTLS; if not, write to the Free Software
-;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-;;; Written by Ludovic Courtès <ludo@chbouib.org>.
-
-
-(use-modules (gnutls build priorities))
-
-
-;;;
-;;; The program.
-;;;
-
-(define (main . args)
-  (let ((port (current-output-port)))
-    (for-each (lambda (priority)
-                (output-session-set-priority-function priority port))
-              %gnutls-priorities)))
-
-(main)
-
-;;; Local Variables:
-;;; mode: scheme
-;;; coding: latin-1
-;;; End:
-
-;;; arch-tag: 026228de-e6d6-421b-bf2f-aaf9630d6b73