Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1331

Timestamp:

12/19/06 10:04:13

Author:

oysteigi

Message:

Revert refcount fix which introduced some more serious problems

Files:

trunk/ChangeLog (modified) (1 diff)
trunk/libtinymail-camel/tny-camel-common.c (modified) (1 diff)
trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
trunk/libtinymail-camel/tny-camel-store-account.c (modified) (1 diff)
trunk/libtinymail-test/tny-device-test.c (modified) (1 diff)
trunk/tests/functional/folder-lister-async.c (modified) (1 diff)
trunk/tests/functional/folder-lister.c (modified) (1 diff)
trunk/tests/functional/msg-transfer.c (modified) (2 diffs)
trunk/tests/memory/memory-test.c (modified) (1 diff)
trunk/tests/shared/account-store.c (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/ChangeLog

r1330	r1331
1		~~2006-12-19 Oystein Gisnas <oystein@gisnas.net>~~
2
3		* Fix several reference counting problems
4
5	1	2006-12-16 Philip Van Hoof <pvanhoof@gnome.org>
6	2

trunk/libtinymail-camel/tny-camel-common.c

r1330	r1331
30	30	gboolean retval = FALSE;
31	31
32		if (!query)
33		return TRUE;
	32	if (query && (tny_list_get_length (tny_folder_store_query_get_items (query)) > 0))
	33	{
	34	TnyList *items = tny_folder_store_query_get_items (query);
	35	TnyIterator *iterator;
	36	iterator = tny_list_create_iterator (items);
34	37
35		TnyList *items = tny_folder_store_query_get_items (query);
36		if (tny_list_get_length (items) <= 0)
37		{
38		g_object_unref (G_OBJECT (items));
39		return TRUE;
40		}
41		TnyIterator *iterator;
42		iterator = tny_list_create_iterator (items);
	38	while (!tny_iterator_is_done (iterator))
	39	{
	40	TnyFolderStoreQueryItem item = (TnyFolderStoreQueryItem) tny_iterator_get_current (iterator);
	41	TnyFolderStoreQueryOption options = tny_folder_store_query_item_get_options (item);
	42	regex_t *regex = tny_folder_store_query_item_get_regex (item);
43	43
44		while (!tny_iterator_is_done (iterator))
45		{
46		TnyFolderStoreQueryItem item = (TnyFolderStoreQueryItem) tny_iterator_get_current (iterator);
47		TnyFolderStoreQueryOption options = tny_folder_store_query_item_get_options (item);
48		regex_t *regex = tny_folder_store_query_item_get_regex (item);
49
50		if ((options & TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED) &&
51		finfo->flags & CAMEL_FOLDER_SUBSCRIBED)
52		retval = TRUE;
53
54		if ((options & TNY_FOLDER_STORE_QUERY_OPTION_UNSUBSCRIBED) &&
55		!(finfo->flags & CAMEL_FOLDER_SUBSCRIBED))
56		retval = TRUE;
57
58		if (regex && options & TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME)
59		if (regexec (regex, finfo->name, 0, NULL, 0) == 0)
	44	if ((options & TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED) &&
	45	finfo->flags & CAMEL_FOLDER_SUBSCRIBED)
60	46	retval = TRUE;
61	47
62		~~if (regex && options & TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_ID)~~
63		~~if (regexec (regex, finfo->full_name, 0, NULL, 0) == 0~~)
	48	if ((options & TNY_FOLDER_STORE_QUERY_OPTION_UNSUBSCRIBED) &&
	49	!(finfo->flags & CAMEL_FOLDER_SUBSCRIBED))
64	50	retval = TRUE;
65	51
66		g_object_unref (G_OBJECT (item));
67		tny_iterator_next (iterator);
68		}
69
70		g_object_unref (G_OBJECT (iterator));
71		g_object_unref (G_OBJECT (items));
	52	if (regex && options & TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME)
	53	if (regexec (regex, finfo->name, 0, NULL, 0) == 0)
	54	retval = TRUE;
	55
	56	if (regex && options & TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_ID)
	57	if (regexec (regex, finfo->full_name, 0, NULL, 0) == 0)
	58	retval = TRUE;
	59
	60	g_object_unref (G_OBJECT (item));
	61	tny_iterator_next (iterator);
	62	}
	63
	64	g_object_unref (G_OBJECT (iterator));
	65	g_object_unref (G_OBJECT (items));
	66	} else
	67	retval = TRUE;
72	68
73	69	return retval;

trunk/libtinymail-camel/tny-camel-folder.c

r1330	r1331
1534	1534	tny_iterator_next (iter);
1535	1535	}
1536		~~g_object_unref (G_OBJECT (iter));~~
1537	1536
1538	1537	ex = camel_exception_new ();
…	…
1958	1957
1959	1958	tny_list_prepend (list, G_OBJECT (folder));
1960
1961		~~g_object_unref (G_OBJECT (folder));~~
1962	1959	}
1963	1960	iter = iter->next;

trunk/libtinymail-camel/tny-camel-store-account.c

r1330	r1331
520	520
521	521	tny_list_prepend (list, G_OBJECT (folder));
522		~~g_object_unref (G_OBJECT (folder));~~
523	522	}
524	523	iter = iter->next;

trunk/libtinymail-test/tny-device-test.c

r1309	r1331
59	59	END_TEST
60	60
	61	START_TEST (tny_device_test_connection_changed)
	62	{
	63	}
	64	END_TEST
	65
61	66	Suite *
62	67	create_tny_device_suite (void)
63	68	{
64	69	Suite *s = suite_create ("Device");
	70	TCase *tc = NULL;
65	71
66		TCase *tc = tcase_create ("Is Online");
	72	tc = tcase_create ("Is Online");
67	73	tcase_add_checked_fixture (tc, tny_device_test_setup, tny_device_test_teardown);
68	74	tcase_add_test (tc, tny_device_test_is_online);
69	75	suite_add_tcase (s, tc);
70	76
	77	/* Make sure test fails when signal is not received */
	78	tc = tcase_create ("Connection Changed");
	79	tcase_add_checked_fixture (tc, tny_device_test_setup, tny_device_test_teardown);
	80	tcase_add_test_raise_signal (tc, tny_device_test_connection_changed, tny_device_signals [TNY_DEVICE_CONNECTION_CHANGED]);
	81	suite_add_tcase (s, tc);
	82
71	83	return s;
72	84	}

trunk/tests/functional/folder-lister-async.c

r1330	r1331
124	124	tny_account_store_get_accounts (account_store, accounts,
125	125	TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
126		~~g_object_unref (G_OBJECT (account_store));~~
127	126
128	127	iter = tny_list_create_iterator (accounts);

trunk/tests/functional/folder-lister.c

r1330	r1331
106	106	tny_account_store_get_accounts (account_store, accounts,
107	107	TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
108		~~g_object_unref (G_OBJECT (account_store));~~
109	108
110	109	iter = tny_list_create_iterator (accounts);

trunk/tests/functional/msg-transfer.c

r1330	r1331
128	128	tny_account_store_get_accounts (account_store, accounts,
129	129	TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
130		~~g_object_unref (G_OBJECT (account_store));~~
131	130
132	131	iter = tny_list_create_iterator (accounts);
…	…
175	174
176	175	cleanup:
177		~~g_object_unref (folder_src);~~
178		~~g_object_unref (folder_dst);~~
179	176	g_object_unref (account);
180	177	g_object_unref (query);

trunk/tests/memory/memory-test.c

r1330	r1331
157	157	tny_account_store_get_accounts (account_store, accounts,
158	158	TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
159		~~g_object_unref (G_OBJECT (account_store));~~
160	159
161	160	aiter = tny_list_create_iterator (accounts);

trunk/tests/shared/account-store.c

r1330	r1331
157	157
158	158	self->device = tny_platform_factory_new_device (platfact);
159		~~g_object_unref (G_OBJECT (platfact));~~
160	159
161	160	return;
…	…
168	167	TnyTestAccountStore me = (TnyTestAccountStore) object;
169	168
170		~~g_object_unref (G_OBJECT (me->device));~~
171	169	if (me->cache_dir)
172	170	g_free (me->cache_dir);

Changeset Navigation

Changeset 1331

Legend:

Download in other formats: