1 files changed, 7 insertions, 23 deletions
diff --git a/libsoup/auth/soup-auth-manager.h b/libsoup/auth/soup-auth-manager.h
index cf38936a..c17c921c 100644
--- a/libsoup/auth/soup-auth-manager.h
+++ b/libsoup/auth/soup-auth-manager.h
@@ -3,38 +3,24 @@
  * Copyright (C) 2007 Red Hat, Inc.
  */
 
-#ifndef __SOUP_AUTH_MANAGER_H__
-#define __SOUP_AUTH_MANAGER_H__ 1
+#pragma once
 
 #include "soup-types.h"
 #include "soup-auth.h"
 
 G_BEGIN_DECLS
 
-#define SOUP_TYPE_AUTH_MANAGER            (soup_auth_manager_get_type ())
-#define SOUP_AUTH_MANAGER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), SOUP_TYPE_AUTH_MANAGER, SoupAuthManager))
-#define SOUP_AUTH_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_AUTH_MANAGER, SoupAuthManagerClass))
-#define SOUP_IS_AUTH_MANAGER(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), SOUP_TYPE_AUTH_MANAGER))
-#define SOUP_IS_AUTH_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SOUP_TYPE_AUTH_MANAGER))
-#define SOUP_AUTH_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_AUTH_MANAGER, SoupAuthManagerClass))
-
-typedef struct SoupAuthManagerPrivate SoupAuthManagerPrivate;
-
-typedef struct {
-	GObject parent;
-
-	SoupAuthManagerPrivate *priv;
-} SoupAuthManager;
+#define SOUP_TYPE_AUTH_MANAGER (soup_auth_manager_get_type ())
+SOUP_AVAILABLE_IN_2_4
+G_DECLARE_DERIVABLE_TYPE (SoupAuthManager, soup_auth_manager, SOUP, AUTH_MANAGER, GObject)
 
-typedef struct {
+struct _SoupAuthManagerClass {
 	GObjectClass parent_class;
 
 	void (*authenticate) (SoupAuthManager *manager, SoupMessage *msg,
 			      SoupAuth *auth, gboolean retrying);
-} SoupAuthManagerClass;
-
-SOUP_AVAILABLE_IN_2_4
-GType soup_auth_manager_get_type (void);
+        gpointer padding[4];
+};
 
 SOUP_AVAILABLE_IN_2_4
 void  soup_auth_manager_use_auth (SoupAuthManager *manager,
@@ -45,5 +31,3 @@ SOUP_AVAILABLE_IN_2_58
 void soup_auth_manager_clear_cached_credentials (SoupAuthManager *manager);
 
 G_END_DECLS
-
-#endif /* __SOUP_AUTH_MANAGER_H__ */