Merge branch 'master' into pgp

2015-04-30 21:24:06 +01:00
parent d5188a160e 0a6b76d6d3
commit 7730674f45
4 changed files with 13 additions and 36 deletions
--- a/tests/ui/stub_ui.c
+++ b/tests/ui/stub_ui.c
@@ -135,11 +135,6 @@ win_type_t ui_current_win_type(void)
    return (win_type_t)mock();
 }

-int ui_current_win_index(void)
-{
-    return 0;
-}
-
 gboolean ui_current_win_is_otr(void)
 {
    return (gboolean)mock();
@@ -180,10 +175,6 @@ win_type_t ui_win_type(int index)
 }

 void ui_close_win(int index) {}
-gboolean ui_win_exists(int index)
-{
-    return FALSE;
-}

 int ui_win_unread(int index)
 {