Moved roster_list.c

Makefile.am

@@ -5,7 +5,7 @@ core_sources = \
 	src/xmpp/chat_session.h src/xmpp/muc.c src/xmpp/muc.h src/xmpp/jid.h src/xmpp/jid.c \
 	src/xmpp/chat_state.h src/xmpp/chat_state.c \
 	src/xmpp/resource.c src/xmpp/resource.h \
-	src/roster_list.c src/roster_list.h \
+	src/xmpp/roster_list.c src/xmpp/roster_list.h \
 	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/session.c \
 	src/xmpp/connection.h src/xmpp/connection.c \
 	src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c \
@@ -63,7 +63,7 @@ unittest_sources = \
 	src/xmpp/chat_session.h src/xmpp/muc.c src/xmpp/muc.h src/xmpp/jid.h src/xmpp/jid.c \
 	src/xmpp/resource.c src/xmpp/resource.h \
 	src/xmpp/chat_state.h src/xmpp/chat_state.c \
-	src/roster_list.c src/roster_list.h \
+	src/xmpp/roster_list.c src/xmpp/roster_list.h \
 	src/xmpp/xmpp.h src/xmpp/form.c \
 	src/ui/ui.h \
 	src/otr/otr.h \

src/command/cmd_ac.c

@@ -48,7 +48,7 @@
 #include "config/scripts.h"
 #include "xmpp/muc.h"
 #include "xmpp/xmpp.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "window_list.h"
 #include "plugins/plugins.h"
 #include "command/cmd_ac.h"

src/command/cmd_defs.c

@@ -59,7 +59,7 @@
 #include "config/tlscerts.h"
 #include "config/scripts.h"
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/jid.h"
 #include "log.h"
 #include "xmpp/muc.h"

src/command/cmd_funcs.c

@@ -61,7 +61,7 @@
 #include "config/tlscerts.h"
 #include "config/scripts.h"
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/jid.h"
 #include "log.h"
 #include "xmpp/muc.h"

src/event/client_events.c

@@ -41,7 +41,7 @@
 #include "ui/ui.h"
 #include "window_list.h"
 #include "xmpp/xmpp.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/chat_session.h"
 #include "plugins/plugins.h"
 #ifdef HAVE_LIBOTR

src/event/server_events.c

@@ -44,7 +44,7 @@
 #include "config/preferences.h"
 #include "config/account.h"
 #include "config/scripts.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "plugins/plugins.h"
 #include "window_list.h"
 #include "config/tlscerts.h"

src/otr/otr.c

@@ -41,7 +41,7 @@
 #include "otr/otr.h"
 #include "otr/otrlib.h"
 #include "log.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "window_list.h"
 #include "xmpp/contact.h"
 #include "ui/ui.h"

src/profanity.c

@@ -57,7 +57,7 @@
 #include "command/cmd_defs.h"
 #include "common.h"
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "config/tlscerts.h"
 #include "log.h"
 #include "xmpp/muc.h"

src/ui/chatwin.c

@@ -40,7 +40,7 @@
 
 #include "xmpp/chat_session.h"
 #include "window_list.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "log.h"
 #include "config/preferences.h"
 #include "ui/ui.h"

src/ui/console.c

@@ -47,7 +47,7 @@
 #include "common.h"
 #include "log.h"
 #include "xmpp/muc.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "ui/window.h"

src/ui/core.c

@@ -61,7 +61,7 @@
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/jid.h"
 #include "log.h"
 #include "xmpp/muc.h"

src/ui/inputwin.c

@@ -62,7 +62,7 @@
 #include "log.h"
 #include "xmpp/muc.h"
 #include "profanity.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"
 #include "ui/inputwin.h"

src/ui/rosterwin.c

@@ -41,7 +41,7 @@
 #include "ui/window.h"
 #include "window_list.h"
 #include "config/preferences.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 
 typedef enum {
     ROSTER_CONTACT,

src/ui/titlebar.c

@@ -46,7 +46,7 @@
 #include "ui/inputwin.h"
 #include "window_list.h"
 #include "ui/window.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/chat_session.h"
 
 static WINDOW *win;

src/ui/window.c

@@ -49,7 +49,7 @@
 
 #include "config/theme.h"
 #include "config/preferences.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "xmpp/xmpp.h"

src/window_list.c

@@ -41,7 +41,7 @@
 #include <glib.h>
 
 #include "common.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "config/theme.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"

src/xmpp/roster_list.h

@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef ROSTER_LIST_H
+#ifndef XMPP_ROSTER_LIST_H
-#define ROSTER_LIST_H
+#define XMPP_ROSTER_LIST_H
 
 #include <glib.h>
 

tests/unittests/test_cmd_disconnect.c

@@ -8,7 +8,7 @@
 #include "xmpp/chat_session.h"
 #include "command/cmd_funcs.h"
 #include "xmpp/xmpp.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 
 #include "ui/stub_ui.h"
 

tests/unittests/test_cmd_roster.c

@@ -10,7 +10,7 @@
 #include "ui/stub_ui.h"
 
 #include "xmpp/xmpp.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "command/cmd_funcs.h"
 
 #define CMD_ROSTER "/roster"

tests/unittests/test_roster_list.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 #include "xmpp/contact.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 
 void empty_list_when_none_added(void **state)
 {

tests/unittests/test_server_events.c

@@ -7,7 +7,7 @@
 #include <glib.h>
 
 #include "event/server_events.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/chat_session.h"
 #include "config/preferences.h"
 #include "ui/ui.h"