GNOME.org
 

[almanah/38-port-to-gtk4] [session-manager] Removed deprecated g_type_class_add_private

commit 029585d1c0f8fdcf64bc40d267b1b2ae4050c098
Author: Álvaro Peña <alvaropg gmail com>
Date:   Tue Apr 5 21:28:56 2022 +0200

    [session-manager] Removed deprecated g_type_class_add_private

 src/storage-manager.c | 76 +++++++++++++++++++++++++++++----------------------
 src/storage-manager.h |  3 --
 2 files changed, 44 insertions(+), 35 deletions(-)
---
diff --git a/src/storage-manager.c b/src/storage-manager.c
index 887a0f9..ab889a3 100644
--- a/src/storage-manager.c
+++ b/src/storage-manager.c
@@ -38,11 +38,11 @@ static void almanah_storage_manager_get_property (GObject *object, guint propert
 static void almanah_storage_manager_set_property (GObject *object, guint property_id, const GValue *value, 
GParamSpec *pspec);
 static gboolean simple_query (AlmanahStorageManager *self, const gchar *query, GError **error, ...);
 
-struct _AlmanahStorageManagerPrivate {
+typedef struct {
        gchar *filename;
        sqlite3 *connection;
        GSettings *settings;
-};
+} AlmanahStorageManagerPrivate;
 
 enum {
        PROP_FILENAME = 1,
@@ -61,8 +61,7 @@ enum {
 
 static guint storage_manager_signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (AlmanahStorageManager, almanah_storage_manager, G_TYPE_OBJECT)
-#define ALMANAH_STORAGE_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), 
ALMANAH_TYPE_STORAGE_MANAGER, AlmanahStorageManagerPrivate))
+G_DEFINE_TYPE_WITH_CODE(AlmanahStorageManager, almanah_storage_manager, G_TYPE_OBJECT, 
G_ADD_PRIVATE(AlmanahStorageManager))
 
 GQuark
 almanah_storage_manager_error_quark (void)
@@ -75,8 +74,6 @@ almanah_storage_manager_class_init (AlmanahStorageManagerClass *klass)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (klass, sizeof (AlmanahStorageManagerPrivate));
-
        gobject_class->set_property = almanah_storage_manager_set_property;
        gobject_class->get_property = almanah_storage_manager_get_property;
        gobject_class->finalize = almanah_storage_manager_finalize;
@@ -134,8 +131,8 @@ almanah_storage_manager_class_init (AlmanahStorageManagerClass *klass)
 static void
 almanah_storage_manager_init (AlmanahStorageManager *self)
 {
-       self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_STORAGE_MANAGER, 
AlmanahStorageManagerPrivate);
-       self->priv->filename = NULL;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
+       priv->filename = NULL;
 }
 
 /**
@@ -165,7 +162,7 @@ almanah_storage_manager_new (const gchar *filename, GSettings *settings)
 static void
 almanah_storage_manager_finalize (GObject *object)
 {
-       AlmanahStorageManagerPrivate *priv = ALMANAH_STORAGE_MANAGER (object)->priv;
+       AlmanahStorageManagerPrivate *priv = 
almanah_storage_manager_get_instance_private(ALMANAH_STORAGE_MANAGER (object));
 
        g_free (priv->filename);
 
@@ -176,7 +173,7 @@ almanah_storage_manager_finalize (GObject *object)
 static void
 almanah_storage_manager_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       AlmanahStorageManagerPrivate *priv = ALMANAH_STORAGE_MANAGER (object)->priv;
+       AlmanahStorageManagerPrivate *priv = 
almanah_storage_manager_get_instance_private(ALMANAH_STORAGE_MANAGER (object));
 
        switch (property_id) {
                case PROP_FILENAME:
@@ -195,7 +192,7 @@ almanah_storage_manager_get_property (GObject *object, guint property_id, GValue
 static void
 almanah_storage_manager_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec 
*pspec)
 {
-       AlmanahStorageManagerPrivate *priv = ALMANAH_STORAGE_MANAGER (object)->priv;
+       AlmanahStorageManagerPrivate *priv = 
almanah_storage_manager_get_instance_private(ALMANAH_STORAGE_MANAGER (object));
 
        switch (property_id) {
                case PROP_FILENAME:
@@ -238,14 +235,15 @@ create_tables (AlmanahStorageManager *self)
 gboolean
 almanah_storage_manager_connect (AlmanahStorageManager *self, GError **error)
 {
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
        /* Our beautiful SQLite VFS */
-       almanah_vfs_init(self->priv->settings);
+       almanah_vfs_init(priv->settings);
 
        /* Open the plain database */
-       if (sqlite3_open_v2 (self->priv->filename, &(self->priv->connection), SQLITE_OPEN_READWRITE | 
SQLITE_OPEN_CREATE, "almanah") != SQLITE_OK) {
+       if (sqlite3_open_v2 (priv->filename, &(priv->connection), SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, 
"almanah") != SQLITE_OK) {
                g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_OPENING_FILE,
                             _("Could not open database \"%s\". SQLite provided the following error message: 
%s"),
-                            self->priv->filename, sqlite3_errmsg (self->priv->connection));
+                            priv->filename, sqlite3_errmsg (priv->connection));
                return FALSE;
        }
 
@@ -259,8 +257,9 @@ gboolean
 almanah_storage_manager_disconnect (AlmanahStorageManager *self, __attribute__ ((unused)) GError **error)
 {
        int sqlite_ret;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
-       sqlite_ret = sqlite3_close (self->priv->connection);
+       sqlite_ret = sqlite3_close (priv->connection);
 
        if (sqlite_ret != SQLITE_OK)
                g_signal_emit (self, storage_manager_signals[SIGNAL_DISCONNECTED], 0, NULL, "Something goes 
wrong closing the database");
@@ -275,7 +274,7 @@ almanah_storage_manager_disconnect (AlmanahStorageManager *self, __attribute__ (
 static gboolean
 simple_query (AlmanahStorageManager *self, const gchar *query, GError **error, ...)
 {
-       AlmanahStorageManagerPrivate *priv = self->priv;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
        gchar *new_query;
        va_list params;
 
@@ -302,11 +301,12 @@ gboolean
 almanah_storage_manager_get_statistics (AlmanahStorageManager *self, guint *entry_count)
 {
        sqlite3_stmt *statement;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        *entry_count = 0;
 
        /* Get the number of entries and the number of letters */
-       if (sqlite3_prepare_v2 (self->priv->connection, "SELECT COUNT (year) FROM entries", -1, &statement, 
NULL) != SQLITE_OK)
+       if (sqlite3_prepare_v2 (priv->connection, "SELECT COUNT (year) FROM entries", -1, &statement, NULL) 
!= SQLITE_OK)
                return FALSE;
 
        if (sqlite3_step (statement) != SQLITE_ROW) {
@@ -325,8 +325,9 @@ almanah_storage_manager_entry_exists (AlmanahStorageManager *self, GDate *date)
 {
        sqlite3_stmt *statement;
        gboolean exists = FALSE;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
-       if (sqlite3_prepare_v2 (self->priv->connection, "SELECT day FROM entries WHERE year = ? AND month = ? 
AND day = ? LIMIT 1", -1,
+       if (sqlite3_prepare_v2 (priv->connection, "SELECT day FROM entries WHERE year = ? AND month = ? AND 
day = ? LIMIT 1", -1,
                                &statement, NULL) != SQLITE_OK) {
                return FALSE;
        }
@@ -392,9 +393,10 @@ almanah_storage_manager_get_entry (AlmanahStorageManager *self, GDate *date)
 {
        AlmanahEntry *entry;
        sqlite3_stmt *statement;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        /* Prepare the statement */
-       if (sqlite3_prepare_v2 (self->priv->connection,
+       if (sqlite3_prepare_v2 (priv->connection,
                                "SELECT content, is_important, day, month, year, edited_day, edited_month, 
edited_year, version FROM entries "
                                "WHERE year = ? AND month = ? AND day = ?", -1,
                                &statement, NULL) != SQLITE_OK) {
@@ -434,6 +436,7 @@ gboolean
 almanah_storage_manager_set_entry (AlmanahStorageManager *self, AlmanahEntry *entry)
 {
        GDate date;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        almanah_entry_get_date (entry, &date);
 
@@ -459,7 +462,7 @@ almanah_storage_manager_set_entry (AlmanahStorageManager *self, AlmanahEntry *en
                existed_before = almanah_storage_manager_entry_exists (self, &date);
 
                /* Prepare the statement */
-               if (sqlite3_prepare_v2 (self->priv->connection,
+               if (sqlite3_prepare_v2 (priv->connection,
                                        "REPLACE INTO entries "
                                        "(year, month, day, content, is_important, edited_day, edited_month, 
edited_year, version) "
                                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", -1,
@@ -548,6 +551,7 @@ almanah_storage_manager_search_entries (AlmanahStorageManager *self, const gchar
 {
        sqlite3_stmt *statement;
        GtkTextBuffer *text_buffer;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        g_return_val_if_fail (ALMANAH_IS_STORAGE_MANAGER (self), NULL);
        g_return_val_if_fail (iter != NULL, NULL);
@@ -561,7 +565,7 @@ almanah_storage_manager_search_entries (AlmanahStorageManager *self, const gchar
                SearchData *data;
 
                /* Prepare the statement. */
-               if (sqlite3_prepare_v2 (self->priv->connection,
+               if (sqlite3_prepare_v2 (priv->connection,
                                        "SELECT e.content, e.is_important, e.day, e.month, e.year, 
e.edited_day, e.edited_month, e.edited_year, e.version, GROUP_CONCAT(et.tag) AS tags FROM entries AS e "
                                        "LEFT JOIN entry_tag AS et ON (e.day=et.day AND e.month=et.month AND 
e.year=et.year) "
                                        "GROUP BY e.year, e.month, e.day "
@@ -818,6 +822,7 @@ AlmanahEntry *
 almanah_storage_manager_get_entries (AlmanahStorageManager *self, AlmanahStorageManagerIter *iter)
 {
        sqlite3_stmt *statement;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        g_return_val_if_fail (ALMANAH_IS_STORAGE_MANAGER (self), NULL);
        g_return_val_if_fail (iter != NULL, NULL);
@@ -827,7 +832,7 @@ almanah_storage_manager_get_entries (AlmanahStorageManager *self, AlmanahStorage
 
        if (iter->statement == NULL) {
                /* Prepare the statement */
-               if (sqlite3_prepare_v2 (self->priv->connection,
+               if (sqlite3_prepare_v2 (priv->connection,
                                        "SELECT content, is_important, day, month, year, edited_day, 
edited_month, edited_year, version "
                                        "FROM entries", -1,
                                        (sqlite3_stmt**) &(iter->statement), NULL) != SQLITE_OK) {
@@ -868,6 +873,7 @@ almanah_storage_manager_get_month_marked_days (AlmanahStorageManager *self, GDat
        sqlite3_stmt *statement;
        gint i, result;
        gboolean *days;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        /* Build the result array */
        i = g_date_get_days_in_month (month, year);
@@ -876,7 +882,7 @@ almanah_storage_manager_get_month_marked_days (AlmanahStorageManager *self, GDat
        days = g_malloc0 (sizeof (gboolean) * i);
 
        /* Prepare and run the query */
-       if (sqlite3_prepare_v2 (self->priv->connection, "SELECT day FROM entries WHERE year = ? AND month = 
?", -1, &statement, NULL) != SQLITE_OK) {
+       if (sqlite3_prepare_v2 (priv->connection, "SELECT day FROM entries WHERE year = ? AND month = ?", -1, 
&statement, NULL) != SQLITE_OK) {
                g_free (days);
                return NULL;
        }
@@ -906,6 +912,7 @@ almanah_storage_manager_get_month_important_days (AlmanahStorageManager *self, G
        sqlite3_stmt *statement;
        gint i, result;
        gboolean *days;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        /* Build the result array */
        i = g_date_get_days_in_month (month, year);
@@ -914,7 +921,7 @@ almanah_storage_manager_get_month_important_days (AlmanahStorageManager *self, G
        days = g_malloc0 (sizeof (gboolean) * i);
 
        /* Prepare and run the query */
-       if (sqlite3_prepare_v2 (self->priv->connection, "SELECT day FROM entries WHERE year = ? AND month = ? 
AND is_important = 1", -1,
+       if (sqlite3_prepare_v2 (priv->connection, "SELECT day FROM entries WHERE year = ? AND month = ? AND 
is_important = 1", -1,
                                &statement, NULL) != SQLITE_OK) {
                g_free (days);
                return NULL;
@@ -941,7 +948,8 @@ almanah_storage_manager_get_month_important_days (AlmanahStorageManager *self, G
 const gchar *
 almanah_storage_manager_get_filename (AlmanahStorageManager *self)
 {
-       return self->priv->filename;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
+       return priv->filename;
 }
 
 /**
@@ -961,6 +969,7 @@ almanah_storage_manager_entry_add_tag (AlmanahStorageManager *self, AlmanahEntry
        GDate entry_date;
        sqlite3_stmt *statement;
        gint result_error;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        g_return_val_if_fail (ALMANAH_IS_STORAGE_MANAGER (self), FALSE);
        g_return_val_if_fail (ALMANAH_IS_ENTRY (entry), FALSE);
@@ -978,7 +987,7 @@ almanah_storage_manager_entry_add_tag (AlmanahStorageManager *self, AlmanahEntry
                return FALSE;
        }
 
-       if ((result_error = sqlite3_prepare_v2 (self->priv->connection,
+       if ((result_error = sqlite3_prepare_v2 (priv->connection,
                                                "INSERT INTO entry_tag (year, month, day, tag) VALUES (?, ?, 
?, ?)",
                                                -1, &statement, NULL)) != SQLITE_OK) {
                g_debug ("Can't prepare statement. SQLite error code: %d", result_error);
@@ -1052,6 +1061,7 @@ almanah_storage_manager_entry_get_tags (AlmanahStorageManager *self, AlmanahEntr
        GDate date;
        sqlite3_stmt *statement;
        gint result;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        g_return_val_if_fail (ALMANAH_IS_STORAGE_MANAGER (self), FALSE);
        g_return_val_if_fail (ALMANAH_IS_ENTRY (entry), FALSE);
@@ -1062,7 +1072,7 @@ almanah_storage_manager_entry_get_tags (AlmanahStorageManager *self, AlmanahEntr
                return NULL;
        }
 
-       if (sqlite3_prepare_v2 (self->priv->connection,
+       if (sqlite3_prepare_v2 (priv->connection,
                                "SELECT DISTINCT tag FROM entry_tag WHERE year = ? AND month = ? AND day = ?",
                                -1, &statement, NULL) != SQLITE_OK) {
                g_debug ("Can't prepare statement");
@@ -1080,7 +1090,7 @@ almanah_storage_manager_entry_get_tags (AlmanahStorageManager *self, AlmanahEntr
        sqlite3_finalize (statement);
 
        if (result != SQLITE_DONE) {
-               g_debug ("Error querying for tags from database: %s", sqlite3_errmsg 
(self->priv->connection));
+               g_debug ("Error querying for tags from database: %s", sqlite3_errmsg (priv->connection));
                g_list_free_full (tags, (GDestroyNotify) g_free);
                tags = NULL;
        }
@@ -1104,6 +1114,7 @@ almanah_storage_manager_entry_check_tag (AlmanahStorageManager *self, AlmanahEnt
        gboolean result, q_result;
        sqlite3_stmt *statement;
        GDate date;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        g_return_val_if_fail (ALMANAH_IS_STORAGE_MANAGER (self), FALSE);
        g_return_val_if_fail (ALMANAH_IS_ENTRY (entry), FALSE);
@@ -1117,7 +1128,7 @@ almanah_storage_manager_entry_check_tag (AlmanahStorageManager *self, AlmanahEnt
                return FALSE;
        }
 
-       if (sqlite3_prepare_v2 (self->priv->connection, 
+       if (sqlite3_prepare_v2 (priv->connection, 
                                "SELECT count(1) FROM entry_tag WHERE year = ? AND month = ? AND day = ? AND 
tag = ?",
                                -1, &statement, NULL) != SQLITE_OK) {
                g_debug ("Can't prepare statement");
@@ -1135,7 +1146,7 @@ almanah_storage_manager_entry_check_tag (AlmanahStorageManager *self, AlmanahEnt
        }
 
        if (q_result != SQLITE_DONE) {
-               g_debug ("Error querying for a tag from database: %s", sqlite3_errmsg 
(self->priv->connection));
+               g_debug ("Error querying for a tag from database: %s", sqlite3_errmsg (priv->connection));
        }
 
        sqlite3_finalize (statement);
@@ -1158,10 +1169,11 @@ almanah_storage_manager_get_tags (AlmanahStorageManager *self)
        GList *tags = NULL;
        sqlite3_stmt *statement;
        gint result;
+       AlmanahStorageManagerPrivate *priv = almanah_storage_manager_get_instance_private(self);
 
        g_return_val_if_fail (ALMANAH_IS_STORAGE_MANAGER (self), FALSE);
 
-       if ((result = sqlite3_prepare_v2 (self->priv->connection, "SELECT DISTINCT tag FROM entry_tag", -1, 
&statement, NULL)) != SQLITE_OK) {
+       if ((result = sqlite3_prepare_v2 (priv->connection, "SELECT DISTINCT tag FROM entry_tag", -1, 
&statement, NULL)) != SQLITE_OK) {
                g_debug ("Can't prepare statement, error code: %d", result);
                return NULL;
        }
@@ -1173,7 +1185,7 @@ almanah_storage_manager_get_tags (AlmanahStorageManager *self)
        sqlite3_finalize (statement);
 
        if (result != SQLITE_DONE) {
-               g_debug ("Error querying for tags from database: %s", sqlite3_errmsg 
(self->priv->connection));
+               g_debug ("Error querying for tags from database: %s", sqlite3_errmsg (priv->connection));
                g_free (tags);
                tags = NULL;
        }
diff --git a/src/storage-manager.h b/src/storage-manager.h
index 9a2551a..d35dbd8 100644
--- a/src/storage-manager.h
+++ b/src/storage-manager.h
@@ -36,11 +36,8 @@ G_BEGIN_DECLS
 #define ALMANAH_IS_STORAGE_MANAGER_CLASS(k)    (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_STORAGE_MANAGER))
 #define ALMANAH_STORAGE_MANAGER_GET_CLASS(o)   (G_TYPE_INSTANCE_GET_CLASS ((o), 
ALMANAH_TYPE_STORAGE_MANAGER, AlmanahStorageManagerClass))
 
-typedef struct _AlmanahStorageManagerPrivate   AlmanahStorageManagerPrivate;
-
 typedef struct {
        GObject parent;
-       AlmanahStorageManagerPrivate *priv;
 } AlmanahStorageManager;
 
 typedef struct {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]