Revert "Apply coding style"

This reverts commit 9b55f2dec0ea27a9ce4856e303425e12f866cea2.

Sorting the includes creates some problems.

1 files changed, 28 insertions, 33 deletions

diff --git a/tests/unittests/test_server_events.c b/tests/unittests/test_server_events.c
index 5ede9fa6..54688dec 100644
--- a/tests/unittests/test_server_events.c
+++ b/tests/unittests/test_server_events.c
@@ -1,32 +1,31 @@
-#include <cmocka.h>
-#include <glib.h>
-#include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
 #include <stdlib.h>
 #include <string.h>
+#include <glib.h>
 
-#include "config/preferences.h"
 #include "event/server_events.h"
-#include "plugins/plugins.h"
-#include "ui/stub_ui.h"
-#include "ui/ui.h"
-#include "ui/window_list.h"
+#include "xmpp/xmpp.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/chat_session.h"
+#include "config/preferences.h"
+#include "ui/ui.h"
+#include "ui/stub_ui.h"
 #include "xmpp/muc.h"
-#include "xmpp/roster_list.h"
-#include "xmpp/xmpp.h"
+#include "plugins/plugins.h"
+#include "ui/window_list.h"
 
-void
-console_shows_online_presence_when_set_online(void** state)
+void console_shows_online_presence_when_set_online(void **state)
 {
     prefs_set_string(PREF_STATUSES_CONSOLE, "online");
     plugins_init();
     roster_create();
     roster_process_pending_presence();
-    char* barejid = "test1@server";
+    char *barejid = "test1@server";
     roster_add(barejid, "bob", NULL, "both", FALSE);
-    Resource* resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
 
     expect_memory(ui_contact_online, barejid, barejid, sizeof(barejid));
     expect_memory(ui_contact_online, resource, resource, sizeof(resource));
@@ -38,16 +37,15 @@ console_shows_online_presence_when_set_online(void** state)
     plugins_shutdown();
 }
 
-void
-console_shows_online_presence_when_set_all(void** state)
+void console_shows_online_presence_when_set_all(void **state)
 {
     prefs_set_string(PREF_STATUSES_CONSOLE, "all");
     plugins_init();
     roster_create();
     roster_process_pending_presence();
-    char* barejid = "test1@server";
+    char *barejid = "test1@server";
     roster_add(barejid, "bob", NULL, "both", FALSE);
-    Resource* resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
 
     expect_memory(ui_contact_online, barejid, barejid, sizeof(barejid));
     expect_memory(ui_contact_online, resource, resource, sizeof(resource));
@@ -59,16 +57,15 @@ console_shows_online_presence_when_set_all(void** state)
     plugins_shutdown();
 }
 
-void
-console_shows_dnd_presence_when_set_all(void** state)
+void console_shows_dnd_presence_when_set_all(void **state)
 {
     prefs_set_string(PREF_STATUSES_CONSOLE, "all");
     plugins_init();
     roster_create();
     roster_process_pending_presence();
-    char* barejid = "test1@server";
+    char *barejid = "test1@server";
     roster_add(barejid, "bob", NULL, "both", FALSE);
-    Resource* resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
+    Resource *resource = resource_new("resource", RESOURCE_ONLINE, NULL, 10);
 
     expect_memory(ui_contact_online, barejid, barejid, sizeof(barejid));
     expect_memory(ui_contact_online, resource, resource, sizeof(resource));
@@ -80,24 +77,23 @@ console_shows_dnd_presence_when_set_all(void** state)
     plugins_shutdown();
 }
 
-void
-handle_offline_removes_chat_session(void** state)
+void handle_offline_removes_chat_session(void **state)
 {
     plugins_init();
     roster_create();
     roster_process_pending_presence();
     chat_sessions_init();
-    char* barejid = "friend@server.chat.com";
-    char* resource = "home";
+    char *barejid = "friend@server.chat.com";
+    char *resource = "home";
     roster_add(barejid, "bob", NULL, "both", FALSE);
-    Resource* resourcep = resource_new(resource, RESOURCE_ONLINE, NULL, 10);
+    Resource *resourcep = resource_new(resource, RESOURCE_ONLINE, NULL, 10);
     roster_update_presence(barejid, resourcep, NULL);
     chat_session_recipient_active(barejid, resource, FALSE);
-    ProfConsoleWin* console = malloc(sizeof(ProfConsoleWin));
+    ProfConsoleWin *console = malloc(sizeof(ProfConsoleWin));
     will_return(win_create_console, &console->window);
     wins_init();
     sv_ev_contact_offline(barejid, resource, NULL);
-    ChatSession* session = chat_session_get(barejid);
+    ChatSession *session = chat_session_get(barejid);
 
     assert_null(session);
 
@@ -106,8 +102,7 @@ handle_offline_removes_chat_session(void** state)
     plugins_shutdown();
 }
 
-void
-lost_connection_clears_chat_sessions(void** state)
+void lost_connection_clears_chat_sessions(void **state)
 {
     roster_create();
     roster_process_pending_presence();
@@ -118,8 +113,8 @@ lost_connection_clears_chat_sessions(void** state)
 
     sv_ev_lost_connection();
 
-    ChatSession* session1 = chat_session_get("bob@server.org");
-    ChatSession* session2 = chat_session_get("steve@server.org");
+    ChatSession *session1 = chat_session_get("bob@server.org");
+    ChatSession *session2 = chat_session_get("steve@server.org");
     assert_null(session1);
     assert_null(session2);
 }