From 2fd043beaafaa08e19f63f6aed2a5434062b122f Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 6 Jul 2011 13:48:57 -0400
Subject: [PATCH] * 6360: updated API calls in tests, but they're not building
yet (cherry picked from commit 548f6f0f919b43772a3e9c667e5e292791281795)
---
sflphone-client-gnome/configure.ac | 1 +
sflphone-client-gnome/src/accountlist.c | 2 +-
sflphone-client-gnome/tests/check_contacts.c | 1 -
sflphone-client-gnome/tests/check_dbus.c | 3 ++-
sflphone-client-gnome/tests/check_global.c | 15 ---------------
5 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac
index 3d1544d5a2..1e94d1923e 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 cf3e96c2dd..29d9fc7442 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 6aed287229..ab38d7b36f 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 902127bb59..2653f84992 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 c1197673da..e50044881a 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;
--
GitLab