4 files changed, 1 insertions, 45 deletions
diff --git a/libemail-engine/mail-vfolder.c b/libemail-engine/mail-vfolder.c
index 3ad3559311..19828aecf9 100644
--- a/libemail-engine/mail-vfolder.c
+++ b/libemail-engine/mail-vfolder.c
@@ -875,11 +875,10 @@ store_folder_deleted_cb (CamelStore *store,
 {
 	EFilterRule *rule;
 	gchar *user;
-	EMailSession *session;
 
 	d(printf("Folder deleted: %s\n", info->name));
 	store = store;
-	session = (EMailSession *) camel_service_get_session ((CamelService *) store);
+
 	/* Warning not thread safe, but might be enough */
 
 	G_LOCK (vfolder);
diff --git a/libemail-utils/em-filter-folder-element.c b/libemail-utils/em-filter-folder-element.c
index 1e286e3e43..26945579cb 100644
--- a/libemail-utils/em-filter-folder-element.c
+++ b/libemail-utils/em-filter-folder-element.c
@@ -50,17 +50,6 @@ G_DEFINE_TYPE (
 
 
 static void
-filter_folder_element_dispose (GObject *object)
-{
-	EMFilterFolderElementPrivate *priv;
-
-	priv = EM_FILTER_FOLDER_ELEMENT_GET_PRIVATE (object);
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (em_filter_folder_element_parent_class)->dispose (object);
-}
-
-static void
 filter_folder_element_finalize (GObject *object)
 {
 	EMFilterFolderElementPrivate *priv;
@@ -193,7 +182,6 @@ em_filter_folder_element_class_init (EMFilterFolderElementClass *class)
 	g_type_class_add_private (class, sizeof (EMFilterFolderElementPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = filter_folder_element_dispose;
 	object_class->finalize = filter_folder_element_finalize;
 
 	filter_element_class = E_FILTER_ELEMENT_CLASS (class);
diff --git a/libemail-utils/em-vfolder-context.c b/libemail-utils/em-vfolder-context.c
index 647ded888c..9270514766 100644
--- a/libemail-utils/em-vfolder-context.c
+++ b/libemail-utils/em-vfolder-context.c
@@ -53,25 +53,10 @@ G_DEFINE_TYPE (
 	em_vfolder_context,
 	E_TYPE_RULE_CONTEXT)
 
-static void
-vfolder_context_dispose (GObject *object)
-{
-	EMVFolderContextPrivate *priv;
-
-	priv = EM_VFOLDER_CONTEXT_GET_PRIVATE (object);
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (em_vfolder_context_parent_class)->dispose (object);
-}
-
 static EFilterElement *
 vfolder_context_new_element (ERuleContext *context,
                              const gchar *type)
 {
-	EMVFolderContextPrivate *priv;
-
-	priv = EM_VFOLDER_CONTEXT_GET_PRIVATE (context);
-
 	if (strcmp (type, "system-flag") == 0)
 		return e_filter_option_new ();
 
@@ -92,14 +77,10 @@ vfolder_context_new_element (ERuleContext *context,
 static void
 em_vfolder_context_class_init (EMVFolderContextClass *class)
 {
-	GObjectClass *object_class;
 	ERuleContextClass *rule_context_class;
 
 	g_type_class_add_private (class, sizeof (EMVFolderContextPrivate));
 
-	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = vfolder_context_dispose;
-
 	rule_context_class = E_RULE_CONTEXT_CLASS (class);
 	rule_context_class->new_element = vfolder_context_new_element;
 }
diff --git a/libemail-utils/em-vfolder-rule.c b/libemail-utils/em-vfolder-rule.c
index 9cf69544f1..393ae5b92f 100644
--- a/libemail-utils/em-vfolder-rule.c
+++ b/libemail-utils/em-vfolder-rule.c
@@ -71,17 +71,6 @@ G_DEFINE_TYPE (
 
 
 static void
-vfolder_rule_dispose (GObject *object)
-{
-	EMVFolderRulePrivate *priv;
-
-	priv = EM_VFOLDER_RULE_GET_PRIVATE (object);
-
-	/* Chain up to parent's dispose() method. */
-	G_OBJECT_CLASS (em_vfolder_rule_parent_class)->dispose (object);
-}
-
-static void
 vfolder_rule_finalize (GObject *object)
 {
 	EMVFolderRule *rule = EM_VFOLDER_RULE (object);
@@ -103,7 +92,6 @@ em_vfolder_rule_class_init (EMVFolderRuleClass *class)
 	g_type_class_add_private (class, sizeof (EMVFolderRulePrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = vfolder_rule_dispose;
 	object_class->finalize = vfolder_rule_finalize;
 
 	filter_rule_class = E_FILTER_RULE_CLASS (class);