Moved roster functions

tests/test_server_events.c

@@ -18,7 +18,7 @@ void console_doesnt_show_online_presence_when_set_none(void **state)
 {
     mock_cons_show_contact_online();
     stub_ui_chat_win_contact_online();
-    stub_ui_roster();
+    stub_rosterwin_roster();
     prefs_set_string(PREF_STATUSES_CONSOLE, "none");
     roster_init();
     roster_add("test1@server", "bob", NULL, "both", FALSE);

tests/ui/mock_ui.c

@@ -29,7 +29,7 @@ void _stub_cons_show(const char * const msg, ...)
 }
 
 static
-void _stub_ui_roster(void)
+void _stub_rosterwin_roster(void)
 {
 }
 
@@ -206,9 +206,9 @@ stub_ui_chat_win_contact_online(void)
 }
 
 void
-stub_ui_roster(void)
+stub_rosterwin_roster(void)
 {
-    ui_roster = _stub_ui_roster;
+    rosterwin_roster = _stub_rosterwin_roster;
 }
 
 void

tests/ui/mock_ui.h

@@ -10,7 +10,7 @@
 #include "ui/window.h"
 
 void stub_cons_show(void);
-void stub_ui_roster(void);
+void stub_rosterwin_roster(void);
 
 void mock_cons_show(void);
 void expect_cons_show(char *output);