X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-local-folders-account.c;h=1891dea29537a0c4c62f9277d95017e56ca77ac9;hb=2be20dcb84c401585cfb8d7f545aee3e6ae7864f;hp=6b2b6a8ebff9063db845ddd73af659d91588d779;hpb=2b001be510aeb979f44dd256664a61edb57ece6f;p=modest

diff --git a/src/modest-tny-local-folders-account.c b/src/modest-tny-local-folders-account.c
index 6b2b6a8..1891dea 100644
--- a/src/modest-tny-local-folders-account.c
+++ b/src/modest-tny-local-folders-account.c
@@ -80,8 +80,8 @@ modest_tny_local_folders_account_class_init (ModestTnyLocalFoldersAccountClass *
 	object_class->finalize = modest_tny_local_folders_account_finalize;
 	  
 	/* Override virtual functions from the parent class: */
-	TNY_CAMEL_STORE_ACCOUNT_CLASS(klass)->get_folders_func = get_folders;
-	TNY_CAMEL_STORE_ACCOUNT_CLASS(klass)->create_folder_func = create_folder;
+	TNY_CAMEL_STORE_ACCOUNT_CLASS(klass)->get_folders = get_folders;
+	TNY_CAMEL_STORE_ACCOUNT_CLASS(klass)->create_folder = create_folder;
 }
 
 static void
@@ -154,7 +154,7 @@ get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GE
 
 	/* Call the base class implementation: */
 	parent_class = g_type_class_peek_parent (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT_GET_CLASS (self));
-	parent_class->get_folders_func (self, list, query, err);
+	parent_class->get_folders (self, list, query, err);
 	
 	/* Add our extra folder only if it passes the query */
 	priv = TNY_LOCAL_FOLDERS_ACCOUNT_GET_PRIVATE (self);
@@ -182,7 +182,7 @@ create_folder (TnyFolderStore *self,
 	}
 
 	/* Call the base class implementation: */
-	return parent_class->create_folder_func (self, name, err);
+	return parent_class->create_folder (self, name, err);
 }
 
 /*****************************/
@@ -270,3 +270,16 @@ modest_tny_local_folders_account_remove_folder_from_outbox (ModestTnyLocalFolder
 	}
 	g_object_unref (merged_folders);
 }
+
+TnyFolder *
+modest_tny_local_folders_account_get_merged_outbox (ModestTnyLocalFoldersAccount *self)
+{
+	ModestTnyLocalFoldersAccountPrivate *priv;
+	g_return_val_if_fail (MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self), NULL);
+
+	priv = TNY_LOCAL_FOLDERS_ACCOUNT_GET_PRIVATE (self);
+	if (priv->outbox_folder)
+		return g_object_ref (priv->outbox_folder);
+	else
+		return NULL;
+}