diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 07:22:14 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:43:04 +0800 |
commit | e64d6fe05c30c2cc1d7625a202afba3ba2da07cd (patch) | |
tree | f99df204ecdd5629acdc9f7e7b00d1c0d7903d6d /mail/e-mail-label-list-store.c | |
parent | 2e60b6a4a21105bb4a1e2badd1be51b3e684d165 (diff) | |
download | gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.gz gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.bz2 gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.lz gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.xz gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.zst gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.zip |
Miscellaneous cleanups.
Diffstat (limited to 'mail/e-mail-label-list-store.c')
-rw-r--r-- | mail/e-mail-label-list-store.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c index 7e8c6f221a..bc9cb5ab3e 100644 --- a/mail/e-mail-label-list-store.c +++ b/mail/e-mail-label-list-store.c @@ -167,32 +167,43 @@ mail_label_list_store_get_stock_id (EMailLabelListStore *store, } static void -mail_label_list_store_finalize (GObject *object) +mail_label_list_store_dispose (GObject *object) { EMailLabelListStorePrivate *priv; priv = E_MAIL_LABEL_LIST_STORE_GET_PRIVATE (object); - g_hash_table_destroy (priv->tag_index); - if (priv->mail_settings != NULL) { g_object_unref (priv->mail_settings); priv->mail_settings = NULL; } + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (e_mail_label_list_store_parent_class)-> + dispose (object); +} + +static void +mail_label_list_store_finalize (GObject *object) +{ + EMailLabelListStorePrivate *priv; + + priv = E_MAIL_LABEL_LIST_STORE_GET_PRIVATE (object); + + g_hash_table_destroy (priv->tag_index); + /* Chain up to parent's finalize() method. */ G_OBJECT_CLASS (e_mail_label_list_store_parent_class)-> finalize (object); } - static void labels_settings_changed_cb (GSettings *settings, const gchar *key, gpointer user_data); static void labels_model_changed_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer user_data) + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) { EMailLabelListStore *store; GPtrArray *array; @@ -228,8 +239,8 @@ labels_model_changed_cb (GtkTreeModel *model, static void labels_settings_changed_cb (GSettings *settings, - const gchar *key, - gpointer user_data) + const gchar *key, + gpointer user_data) { EMailLabelListStore *store; gchar **strv; @@ -326,6 +337,7 @@ e_mail_label_list_store_class_init (EMailLabelListStoreClass *class) g_type_class_add_private (class, sizeof (EMailLabelListStorePrivate)); object_class = G_OBJECT_CLASS (class); + object_class->dispose = mail_label_list_store_dispose; object_class->finalize = mail_label_list_store_finalize; object_class->constructed = mail_label_list_store_constructed; |