From db1a2dd8aad57fb222daa6f82838b33a26f8e742 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Aug 2011 19:05:30 -0400 Subject: Miscellaneous cleanups. Reducing diff noise with the account-mgmt branch. Trying to erode our dependency on EAccount as much as possible, or at least isolate its usage, to make things easier for me on the branch. --- mail/em-folder-tree-model.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'mail/em-folder-tree-model.c') diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 1b79ca9ac6..6c9fc55338 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -55,6 +55,10 @@ #include "e-mail-store.h" #include "shell/e-shell.h" +#define EM_FOLDER_TREE_MODEL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModelPrivate)) + #define d(x) struct _EMFolderTreeModelPrivate { @@ -316,7 +320,7 @@ folder_tree_model_dispose (GObject *object) { EMFolderTreeModelPrivate *priv; - priv = EM_FOLDER_TREE_MODEL (object)->priv; + priv = EM_FOLDER_TREE_MODEL_GET_PRIVATE (object); if (priv->selection != NULL) { g_object_weak_unref ( @@ -339,7 +343,7 @@ folder_tree_model_finalize (GObject *object) { EMFolderTreeModelPrivate *priv; - priv = EM_FOLDER_TREE_MODEL (object)->priv; + priv = EM_FOLDER_TREE_MODEL_GET_PRIVATE (object); g_hash_table_destroy (priv->store_index); g_hash_table_destroy (priv->uri_index); @@ -498,8 +502,7 @@ em_folder_tree_model_init (EMFolderTreeModel *model) (GDestroyNotify) g_free, (GDestroyNotify) gtk_tree_row_reference_free); - model->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - model, EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModelPrivate); + model->priv = EM_FOLDER_TREE_MODEL_GET_PRIVATE (model); model->priv->store_index = store_index; model->priv->uri_index = uri_index; -- cgit v1.2.3