From 39e0782da8a45a40df280eda5abf9051a575a9fa Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 18 Jan 2014 20:34:46 +0000
Subject: Fixed test compilation

---
 src/config/accounts.c        | 2 +-
 src/config/accounts.h        | 2 +-
 src/xmpp/connection.c        | 2 +-
 src/xmpp/xmpp.h              | 2 +-
 tests/config/mock_accounts.c | 4 ++--
 tests/xmpp/mock_xmpp.c       | 3 ++-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/config/accounts.c b/src/config/accounts.c
index 178f726f..6a1ade68 100644
--- a/src/config/accounts.c
+++ b/src/config/accounts.c
@@ -119,7 +119,7 @@ _accounts_reset_enabled_search(void)
 }
 
 static void
-_accounts_add(const char *account_name, const char *altdomain, int port)
+_accounts_add(const char *account_name, const char *altdomain, const int port)
 {
     // set account name and resource
     const char *barejid = account_name;
diff --git a/src/config/accounts.h b/src/config/accounts.h
index 8f7b5c37..74345f0c 100644
--- a/src/config/accounts.h
+++ b/src/config/accounts.h
@@ -56,7 +56,7 @@ char * (*accounts_find_all)(char *prefix);
 char * (*accounts_find_enabled)(char *prefix);
 void (*accounts_reset_all_search)(void);
 void (*accounts_reset_enabled_search)(void);
-void (*accounts_add)(const char *jid, const char *altdomain, int port);
+void (*accounts_add)(const char *jid, const char *altdomain, const int port);
 gchar** (*accounts_get_list)(void);
 ProfAccount* (*accounts_get_account)(const char * const name);
 void (*accounts_free_account)(ProfAccount *account);
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index dc015dd6..2bf5a304 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -132,7 +132,7 @@ _jabber_connect_with_account(const ProfAccount * const account)
 
 static jabber_conn_status_t
 _jabber_connect_with_details(const char * const jid,
-    const char * const passwd, const char * const altdomain, int port)
+    const char * const passwd, const char * const altdomain, const int port)
 {
     assert(jid != NULL);
     assert(passwd != NULL);
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 86f585e4..5a331b04 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -85,7 +85,7 @@ void roster_init_module(void);
 // connection functions
 void (*jabber_init)(const int disable_tls);
 jabber_conn_status_t (*jabber_connect_with_details)(const char * const jid,
-    const char * const passwd, const char * const altdomain, int port);
+    const char * const passwd, const char * const altdomain, const int port);
 jabber_conn_status_t (*jabber_connect_with_account)(const ProfAccount * const account);
 void (*jabber_disconnect)(void);
 void (*jabber_shutdown)(void);
diff --git a/tests/config/mock_accounts.c b/tests/config/mock_accounts.c
index db2e0fd5..1f145125 100644
--- a/tests/config/mock_accounts.c
+++ b/tests/config/mock_accounts.c
@@ -62,14 +62,14 @@ _mock_accounts_get_list(void)
 }
 
 void
-_mock_accounts_add(const char *account_name, const char *altdomain)
+_mock_accounts_add(const char *account_name, const char *altdomain, const int port)
 {
     check_expected(account_name);
     check_expected(altdomain);    
 }
 
 void
-_stub_accounts_add(const char *account_name, const char *altdomain)
+_stub_accounts_add(const char *account_name, const char *altdomain, const int port)
 {
     // do nothing
 }
diff --git a/tests/xmpp/mock_xmpp.c b/tests/xmpp/mock_xmpp.c
index 70bcbc3b..c569d67f 100644
--- a/tests/xmpp/mock_xmpp.c
+++ b/tests/xmpp/mock_xmpp.c
@@ -28,11 +28,12 @@ _mock_iq_room_list_request(gchar *conf_server)
 
 static jabber_conn_status_t
 _mock_jabber_connect_with_details(const char * const jid,
-    const char * const passwd, const char * const altdomain)
+    const char * const passwd, const char * const altdomain, const int port)
 {
     check_expected(jid);
     check_expected(passwd);
     check_expected(altdomain);
+    check_expected(port);
     return (jabber_conn_status_t)mock();
 }
 
-- 
cgit 1.4.1-2-gfad0