X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=915c7876212086886d9b63de7737d99b0d5a9433;hb=3ba4761d803a0cf792916a330bf5c68be2ebf08f;hp=e8d37daa11a0cdc834e81688a734e48b8549fa84;hpb=a0fe83361800a65d99c68d7352f49eed748a930e;p=modest

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index e8d37da..915c787 100644
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -245,10 +245,12 @@ modest_tny_folder_is_memory_card_folder   (TnyFolder *folder)
 		return FALSE;
 
 	const gchar* account_id = tny_account_get_id (account);
-	if (!account_id)
+	if (!account_id) {	
+		g_object_unref (account);
 		return FALSE;
+	}
 
-	g_object_unref (G_OBJECT(account));
+	g_object_unref (account);
 	
 	return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0);
 }	
@@ -328,7 +330,7 @@ modest_tny_folder_get_header_unique_id (TnyHeader *header)
 {
 	TnyFolder *folder;
 	gchar *url, *retval;
-	const gchar *uid;
+	gchar *uid;
 
 	g_return_val_if_fail (TNY_IS_HEADER (header), NULL);
 
@@ -337,9 +339,10 @@ modest_tny_folder_get_header_unique_id (TnyHeader *header)
 		return NULL;
 
 	url = tny_folder_get_url_string (folder);
-	uid = tny_header_get_uid (header);
+	uid = tny_header_dup_uid (header);
 
 	retval = g_strjoin ("/", url, uid, NULL);
+	g_free (uid);
 
 	g_free (url);
 	g_object_unref (folder);