[libsoup/wip/withprivate: 7/26] auth-domain-digest: port to the new private api



commit 0e05c7bb0c30579af487976ad62782bec0461aa8
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Nov 7 10:31:08 2016 +0100

    auth-domain-digest: port to the new private api

 libsoup/soup-auth-domain-digest.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/libsoup/soup-auth-domain-digest.c b/libsoup/soup-auth-domain-digest.c
index bd7b951..5cb4315 100644
--- a/libsoup/soup-auth-domain-digest.c
+++ b/libsoup/soup-auth-domain-digest.c
@@ -40,9 +40,7 @@ typedef struct {
 
 } SoupAuthDomainDigestPrivate;
 
-#define SOUP_AUTH_DOMAIN_DIGEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
SOUP_TYPE_AUTH_DOMAIN_DIGEST, SoupAuthDomainDigestPrivate))
-
-G_DEFINE_TYPE (SoupAuthDomainDigest, soup_auth_domain_digest, SOUP_TYPE_AUTH_DOMAIN)
+G_DEFINE_TYPE_WITH_PRIVATE (SoupAuthDomainDigest, soup_auth_domain_digest, SOUP_TYPE_AUTH_DOMAIN)
 
 static void
 soup_auth_domain_digest_init (SoupAuthDomainDigest *digest)
@@ -53,7 +51,7 @@ static void
 soup_auth_domain_digest_finalize (GObject *object)
 {
        SoupAuthDomainDigestPrivate *priv =
-               SOUP_AUTH_DOMAIN_DIGEST_GET_PRIVATE (object);
+               soup_auth_domain_digest_get_instance_private (SOUP_AUTH_DOMAIN_DIGEST (object));
 
        if (priv->auth_dnotify)
                priv->auth_dnotify (priv->auth_data);
@@ -66,7 +64,7 @@ soup_auth_domain_digest_set_property (GObject *object, guint prop_id,
                                      const GValue *value, GParamSpec *pspec)
 {
        SoupAuthDomainDigestPrivate *priv =
-               SOUP_AUTH_DOMAIN_DIGEST_GET_PRIVATE (object);
+               soup_auth_domain_digest_get_instance_private (SOUP_AUTH_DOMAIN_DIGEST (object));
 
        switch (prop_id) {
        case PROP_AUTH_CALLBACK:
@@ -90,7 +88,7 @@ soup_auth_domain_digest_get_property (GObject *object, guint prop_id,
                                      GValue *value, GParamSpec *pspec)
 {
        SoupAuthDomainDigestPrivate *priv =
-               SOUP_AUTH_DOMAIN_DIGEST_GET_PRIVATE (object);
+               soup_auth_domain_digest_get_instance_private (SOUP_AUTH_DOMAIN_DIGEST (object));
 
        switch (prop_id) {
        case PROP_AUTH_CALLBACK:
@@ -175,7 +173,7 @@ soup_auth_domain_digest_set_auth_callback (SoupAuthDomain *domain,
                                           GDestroyNotify  dnotify)
 {
        SoupAuthDomainDigestPrivate *priv =
-               SOUP_AUTH_DOMAIN_DIGEST_GET_PRIVATE (domain);
+               soup_auth_domain_digest_get_instance_private (SOUP_AUTH_DOMAIN_DIGEST (domain));
 
        if (priv->auth_dnotify)
                priv->auth_dnotify (priv->auth_data);
@@ -269,7 +267,7 @@ soup_auth_domain_digest_accepts (SoupAuthDomain *domain, SoupMessage *msg,
                                 const char *header)
 {
        SoupAuthDomainDigestPrivate *priv =
-               SOUP_AUTH_DOMAIN_DIGEST_GET_PRIVATE (domain);
+               soup_auth_domain_digest_get_instance_private (SOUP_AUTH_DOMAIN_DIGEST (domain));
        GHashTable *params;
        const char *username;
        gboolean accept = FALSE;
@@ -400,8 +398,6 @@ soup_auth_domain_digest_class_init (SoupAuthDomainDigestClass *digest_class)
                SOUP_AUTH_DOMAIN_CLASS (digest_class);
        GObjectClass *object_class = G_OBJECT_CLASS (digest_class);
 
-       g_type_class_add_private (digest_class, sizeof (SoupAuthDomainDigestPrivate));
-
        auth_domain_class->accepts        = soup_auth_domain_digest_accepts;
        auth_domain_class->challenge      = soup_auth_domain_digest_challenge;
        auth_domain_class->check_password = soup_auth_domain_digest_check_password;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]