diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2020-03-25 03:59:41 -0700 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2020-09-19 15:41:24 -0700 |
| commit | 4e39dbad76cbe672cf4a68afe2eb35e0ad0c67bc (patch) | |
| tree | 53ce6ae75af42ecba2326997a3333fb52c35bb93 /libsoup/hsts/soup-hsts-enforcer-db.c | |
| parent | 55d928b6cab01a96295e7d3da86942a3bfb29847 (diff) | |
| download | libsoup-4e39dbad76cbe672cf4a68afe2eb35e0ad0c67bc.tar.gz | |
Modernize GObject declarations
Diffstat (limited to 'libsoup/hsts/soup-hsts-enforcer-db.c')
| -rw-r--r-- | libsoup/hsts/soup-hsts-enforcer-db.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libsoup/hsts/soup-hsts-enforcer-db.c b/libsoup/hsts/soup-hsts-enforcer-db.c index bad688a0..1caa46bf 100644 --- a/libsoup/hsts/soup-hsts-enforcer-db.c +++ b/libsoup/hsts/soup-hsts-enforcer-db.c @@ -34,10 +34,14 @@ enum { LAST_PROP }; -struct _SoupHSTSEnforcerDBPrivate { +struct _SoupHSTSEnforcerDB { + SoupHSTSEnforcer parent; +}; + +typedef struct { char *filename; sqlite3 *db; -}; +} SoupHSTSEnforcerDBPrivate; G_DEFINE_TYPE_WITH_CODE (SoupHSTSEnforcerDB, soup_hsts_enforcer_db, SOUP_TYPE_HSTS_ENFORCER, G_ADD_PRIVATE(SoupHSTSEnforcerDB)) @@ -47,13 +51,12 @@ static void load (SoupHSTSEnforcer *hsts_enforcer); static void soup_hsts_enforcer_db_init (SoupHSTSEnforcerDB *db) { - db->priv = soup_hsts_enforcer_db_get_instance_private (db); } static void soup_hsts_enforcer_db_finalize (GObject *object) { - SoupHSTSEnforcerDBPrivate *priv = SOUP_HSTS_ENFORCER_DB (object)->priv; + SoupHSTSEnforcerDBPrivate *priv = soup_hsts_enforcer_db_get_instance_private ((SoupHSTSEnforcerDB*)object); g_free (priv->filename); sqlite3_close (priv->db); @@ -65,7 +68,7 @@ static void soup_hsts_enforcer_db_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - SoupHSTSEnforcerDBPrivate *priv = SOUP_HSTS_ENFORCER_DB (object)->priv; + SoupHSTSEnforcerDBPrivate *priv = soup_hsts_enforcer_db_get_instance_private ((SoupHSTSEnforcerDB*)object); switch (prop_id) { case PROP_FILENAME: @@ -82,7 +85,7 @@ static void soup_hsts_enforcer_db_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - SoupHSTSEnforcerDBPrivate *priv = SOUP_HSTS_ENFORCER_DB (object)->priv; + SoupHSTSEnforcerDBPrivate *priv = soup_hsts_enforcer_db_get_instance_private ((SoupHSTSEnforcerDB*)object); switch (prop_id) { case PROP_FILENAME: @@ -212,7 +215,7 @@ try_exec: static gboolean open_db (SoupHSTSEnforcer *hsts_enforcer) { - SoupHSTSEnforcerDBPrivate *priv = SOUP_HSTS_ENFORCER_DB (hsts_enforcer)->priv; + SoupHSTSEnforcerDBPrivate *priv = soup_hsts_enforcer_db_get_instance_private ((SoupHSTSEnforcerDB*)hsts_enforcer); char *error = NULL; @@ -234,7 +237,7 @@ open_db (SoupHSTSEnforcer *hsts_enforcer) static void load (SoupHSTSEnforcer *hsts_enforcer) { - SoupHSTSEnforcerDBPrivate *priv = SOUP_HSTS_ENFORCER_DB (hsts_enforcer)->priv; + SoupHSTSEnforcerDBPrivate *priv = soup_hsts_enforcer_db_get_instance_private ((SoupHSTSEnforcerDB*)hsts_enforcer); if (priv->db == NULL) { if (open_db (hsts_enforcer)) @@ -249,7 +252,7 @@ soup_hsts_enforcer_db_changed (SoupHSTSEnforcer *hsts_enforcer, SoupHSTSPolicy *old_policy, SoupHSTSPolicy *new_policy) { - SoupHSTSEnforcerDBPrivate *priv = SOUP_HSTS_ENFORCER_DB (hsts_enforcer)->priv; + SoupHSTSEnforcerDBPrivate *priv = soup_hsts_enforcer_db_get_instance_private ((SoupHSTSEnforcerDB*)hsts_enforcer); char *query; /* Session policies do not need to be stored in the database. */ |