From bcdf2b8a67c2cde3103f709feab3a7adb192a5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@savoirfairelinux.com> Date: Thu, 7 Jul 2011 17:42:23 -0400 Subject: [PATCH] Remove functions only used by a failing test (cherry picked from commit fcf718cb75de7f1882dc61c07bb8d300dfa10f85) --- sflphone-client-gnome/src/accountlist.c | 41 ---------------------- sflphone-client-gnome/src/accountlist.h | 10 ------ sflphone-client-gnome/tests/check_global.c | 11 ------ 3 files changed, 62 deletions(-) diff --git a/sflphone-client-gnome/src/accountlist.c b/sflphone-client-gnome/src/accountlist.c index 29d9fc7442..c321646884 100644 --- a/sflphone-client-gnome/src/accountlist.c +++ b/sflphone-client-gnome/src/accountlist.c @@ -275,46 +275,6 @@ gchar* account_list_get_current_id (void) return ""; } -int account_list_get_sip_account_number (void) -{ - - int n; - guint size, i; - account_t *current; - - size = account_list_get_size(); - n = 0; - - for (i=0; i<size ; i++) { - current = account_list_get_nth (i); - - if (current && strcmp (g_hash_table_lookup (current->properties, ACCOUNT_TYPE), "SIP") == 0) - n++; - } - - return n; -} - -int account_list_get_iax_account_number (void) -{ - - int n; - guint size, i; - account_t *current; - - size = account_list_get_size(); - n = 0; - - for (i=0; i<size ; i++) { - current = account_list_get_nth (i); - - if (strcmp (g_hash_table_lookup (current->properties, ACCOUNT_TYPE), "IAX") == 0) - n++; - } - - return n; -} - gchar * account_list_get_ordered_list (void) { @@ -407,4 +367,3 @@ gboolean current_account_has_new_message (void) return FALSE; } - diff --git a/sflphone-client-gnome/src/accountlist.h b/sflphone-client-gnome/src/accountlist.h index bc893a4900..46103121e9 100644 --- a/sflphone-client-gnome/src/accountlist.h +++ b/sflphone-client-gnome/src/accountlist.h @@ -191,16 +191,6 @@ void account_list_move_down (guint index); */ gchar* account_list_get_current_id (void); -/** - * Returns the number of SIP accounts that have been configured - */ -int account_list_get_sip_account_number (void); - -/** - * Returns the number of IAX accounts that have been configured - */ -int account_list_get_iax_account_number (void); - gchar * account_list_get_ordered_list (void); guint account_list_get_position (account_t *account); diff --git a/sflphone-client-gnome/tests/check_global.c b/sflphone-client-gnome/tests/check_global.c index 53eacbc409..8a3cd2d49f 100644 --- a/sflphone-client-gnome/tests/check_global.c +++ b/sflphone-client-gnome/tests/check_global.c @@ -101,16 +101,6 @@ START_TEST (test_get_by_id) } END_TEST -START_TEST (test_sip_account) -{ - account_t *test = create_test_account ("test"); - - account_list_init (); - account_list_add (test); - fail_unless (account_list_get_sip_account_number () == 1, "ERROR - BAD SIP ACCOUNT NUMBER"); -} -END_TEST - START_TEST (test_get_account_position) { guint pos, pos1; @@ -179,7 +169,6 @@ global_suite (void) TCase *tc_cases = tcase_create ("Accounts"); tcase_add_test (tc_cases, test_add_account); tcase_add_test (tc_cases, test_ordered_list); - tcase_add_test (tc_cases, test_sip_account); tcase_add_test (tc_cases, test_get_by_id); tcase_add_test (tc_cases, test_get_account_position); tcase_add_test (tc_cases, test_get_current_account); -- GitLab