Merge tag '2.46.0' into baserock/markdoffman/morphbaserock/markdoffman/morph

2.46.0

1 files changed, 4 insertions, 43 deletions

diff --git a/libsoup/soup-password-manager.c b/libsoup/soup-password-manager.c
index 3914179f..532ff7eb 100644
--- a/libsoup/soup-password-manager.c
+++ b/libsoup/soup-password-manager.c
@@ -9,8 +9,6 @@
 #include <config.h>
 #endif
 
-#define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
-
 #include "soup-password-manager.h"
 #include "soup.h"
 
@@ -25,27 +23,8 @@ soup_password_manager_default_init (SoupPasswordManagerInterface *iface)
 
 /**
  * soup_password_manager_get_passwords_async:
- * @password_manager: the #SoupPasswordManager
- * @msg: the #SoupMessage being authenticated
- * @auth: the #SoupAuth being authenticated
- * @retrying: whether or not this is a re-attempt to authenticate
- * @async_context: (allow-none): the #GMainContext to invoke @callback in
- * @cancellable: a #GCancellable, or %NULL
- * @callback: callback to invoke after fetching passwords
- * @user_data: data for @callback
- *
- * Asynchronously attempts to look up saved passwords for @auth/@msg
- * and then calls @callback after updating @auth with the information.
- * Also registers @auth with @password_manager so that if the caller
- * calls soup_auth_save_password() on it, the password will be saved.
- *
- * #SoupPasswordManager does not actually use the @retrying flag itself;
- * it just passes its value on to @callback.
- * 
- * If @cancellable is cancelled, @callback will still be invoked.
- *
- * Since: 2.28
- **/
+ * @callback: (scope async)
+ */
 void
 soup_password_manager_get_passwords_async (SoupPasswordManager  *password_manager,
 					   SoupMessage          *msg,
@@ -56,32 +35,14 @@ soup_password_manager_get_passwords_async (SoupPasswordManager  *password_manage
 					   SoupPasswordManagerCallback callback,
 					   gpointer              user_data)
 {
-	SOUP_PASSWORD_MANAGER_GET_CLASS (password_manager)->
-		get_passwords_async (password_manager, msg, auth, retrying,
-				     async_context, cancellable,
-				     callback, user_data);
+	g_warn_if_reached ();
 }
 
-/**
- * soup_password_manager_get_passwords_sync:
- * @password_manager: the #SoupPasswordManager
- * @msg: the #SoupMessage being authenticated
- * @auth: the #SoupAuth being authenticated
- * @cancellable: a #GCancellable, or %NULL
- *
- * Synchronously attempts to look up saved passwords for @auth/@msg
- * and updates @auth with the information. Also registers @auth with
- * @password_manager so that if the caller calls
- * soup_auth_save_password() on it, the password will be saved.
- *
- * Since: 2.28
- **/
 void
 soup_password_manager_get_passwords_sync (SoupPasswordManager  *password_manager,
 					  SoupMessage          *msg,
 					  SoupAuth             *auth,
 					  GCancellable         *cancellable)
 {
-	SOUP_PASSWORD_MANAGER_GET_CLASS (password_manager)->
-		get_passwords_sync (password_manager, msg, auth, cancellable);
+	g_warn_if_reached ();
 }