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

diff --git a/src/modest-tny-local-folders-account.c b/src/modest-tny-local-folders-account.c
index 6b2b6a8..d9e6c2a 100644
--- a/src/modest-tny-local-folders-account.c
+++ b/src/modest-tny-local-folders-account.c
@@ -57,7 +57,8 @@ struct _ModestTnyLocalFoldersAccountPrivate
 
 static void         get_folders    (TnyFolderStore *self, 
 				    TnyList *list, 
-				    TnyFolderStoreQuery *query, 
+				    TnyFolderStoreQuery *query,
+				    gboolean refresh, 
 				    GError **err);
 
 static TnyFolder*   create_folder  (TnyFolderStore *self, 
@@ -67,6 +68,13 @@ static TnyFolder*   create_folder  (TnyFolderStore *self,
 static void
 modest_tny_local_folders_account_finalize (GObject *object)
 {
+	ModestTnyLocalFoldersAccountPrivate *priv;
+
+	priv = TNY_LOCAL_FOLDERS_ACCOUNT_GET_PRIVATE (object);
+	if (priv->outbox_folder) {
+		g_object_unref (priv->outbox_folder);
+		priv->outbox_folder = NULL;
+	}
 	G_OBJECT_CLASS (modest_tny_local_folders_account_parent_class)->finalize (object);
 }
 
@@ -80,8 +88,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
@@ -147,14 +155,18 @@ modest_tny_local_folders_account_query_passes (TnyFolderStoreQuery *query, TnyFo
 }
 
 static void
-get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err)
+get_folders (TnyFolderStore *self, 
+	     TnyList *list, 
+	     TnyFolderStoreQuery *query, 
+	     gboolean refresh, 
+	     GError **err)
 {
 	TnyCamelStoreAccountClass *parent_class;
 	ModestTnyLocalFoldersAccountPrivate *priv;
 
 	/* 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, refresh, err);
 	
 	/* Add our extra folder only if it passes the query */
 	priv = TNY_LOCAL_FOLDERS_ACCOUNT_GET_PRIVATE (self);
@@ -175,14 +187,14 @@ create_folder (TnyFolderStore *self,
 
 	/* If the folder name is been used by our extra folders */
 	if (modest_tny_local_folders_account_folder_name_in_use (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (self), name)) {
-		g_set_error (err, TNY_SERVICE_ERROR, 
+		g_set_error (err, TNY_ERROR_DOMAIN, 
 			     TNY_SERVICE_ERROR_FOLDER_CREATE,
 			     "Folder name already in use");
 		return NULL;
 	}
 
 	/* Call the base class implementation: */
-	return parent_class->create_folder_func (self, name, err);
+	return parent_class->create_folder (self, name, err);
 }
 
 /*****************************/
@@ -270,3 +282,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;
+}