diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac index 3d1544d5a2fdf75b55478697ad71492bd9693e80..1e94d1923e118e4e2cb024d86334997d335c8729 100644 --- a/sflphone-client-gnome/configure.ac +++ b/sflphone-client-gnome/configure.ac @@ -27,6 +27,7 @@ else fi AC_PROG_CC +AM_PROG_CC_C_O dnl for per target flags, i.e. test_program_CFLAGS AC_PROG_INSTALL AC_HEADER_STDC LT_INIT diff --git a/sflphone-client-gnome/src/accountlist.c b/sflphone-client-gnome/src/accountlist.c index cf3e96c2ddedab5f6e169b911de0fcc0c64f4131..29d9fc7442c10ae7d77d003ca659d7ffa4a1aac9 100644 --- a/sflphone-client-gnome/src/accountlist.c +++ b/sflphone-client-gnome/src/accountlist.c @@ -288,7 +288,7 @@ int account_list_get_sip_account_number (void) for (i=0; i<size ; i++) { current = account_list_get_nth (i); - if (strcmp (g_hash_table_lookup (current->properties, ACCOUNT_TYPE), "SIP") == 0) + if (current && strcmp (g_hash_table_lookup (current->properties, ACCOUNT_TYPE), "SIP") == 0) n++; } diff --git a/sflphone-client-gnome/tests/check_contacts.c b/sflphone-client-gnome/tests/check_contacts.c index 6aed2872291b4b6216cdff48ab50bc130f27870f..ab38d7b36f6d53e64744796f1730271a45a05796 100644 --- a/sflphone-client-gnome/tests/check_contacts.c +++ b/sflphone-client-gnome/tests/check_contacts.c @@ -28,7 +28,6 @@ #include <check.h> #include <stdlib.h> -#include "../src/contacts/addressbook/eds.h" #include "../src/contacts/addressbook.h" diff --git a/sflphone-client-gnome/tests/check_dbus.c b/sflphone-client-gnome/tests/check_dbus.c index 902127bb5963029b9d234cc626385863f03973fd..2653f84992229c1d32ac74f047aea71b23399705 100644 --- a/sflphone-client-gnome/tests/check_dbus.c +++ b/sflphone-client-gnome/tests/check_dbus.c @@ -33,7 +33,8 @@ START_TEST (test_dbus_connect) { - fail_unless (dbus_connect () == TRUE, "dbus_connect () returns FALSE"); + GError *error = NULL; + fail_unless (dbus_connect (&error) == TRUE, "dbus_connect () returns FALSE"); } END_TEST diff --git a/sflphone-client-gnome/tests/check_global.c b/sflphone-client-gnome/tests/check_global.c index c1197673daeec0091e23eef129b4394bf5d34eb8..e50044881a14e7c99d1a65681764aac0bed72ebd 100644 --- a/sflphone-client-gnome/tests/check_global.c +++ b/sflphone-client-gnome/tests/check_global.c @@ -171,20 +171,6 @@ START_TEST (test_get_current_account) } END_TEST -START_TEST (test_current_account_has_mailbox) -{ - account_t *test = create_test_account ("test"); - - account_list_init (); - account_list_add (test); - fail_unless (account_list_current_account_has_mailbox () == FALSE, "current account has a default mailbox"); - - g_hash_table_replace (test->properties, ACCOUNT_MAILBOX, "888"); - fail_unless (account_list_current_account_has_mailbox () == TRUE, "current account has not no voicemail number"); -} -END_TEST - - Suite * global_suite (void) { @@ -197,7 +183,6 @@ global_suite (void) 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); - tcase_add_test (tc_cases, test_current_account_has_mailbox); suite_add_tcase (s, tc_cases); return s;