diff --git a/Makefile.am b/Makefile.am index 3a281c97..55723688 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ core_sources = \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ src/ui/console.c src/ui/notifier.c \ src/ui/win_types.h \ - src/window_list.c src/window_list.h \ + src/ui/window_list.c src/ui/window_list.h \ src/ui/rosterwin.c src/ui/occupantswin.c \ src/ui/buffer.c src/ui/buffer.h \ src/ui/chatwin.c \ @@ -90,7 +90,7 @@ unittest_sources = \ src/plugins/themes.c src/plugins/themes.h \ src/plugins/settings.c src/plugins/settings.h \ src/plugins/disco.c src/plugins/disco.h \ - src/window_list.c src/window_list.h \ + src/ui/window_list.c src/ui/window_list.h \ src/event/server_events.c src/event/server_events.h \ src/event/client_events.c src/event/client_events.h \ src/ui/tray.h src/ui/tray.c \ diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 20993a5b..b1273bc9 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -49,7 +49,7 @@ #include "xmpp/muc.h" #include "xmpp/xmpp.h" #include "xmpp/roster_list.h" -#include "window_list.h" +#include "ui/window_list.h" #include "plugins/plugins.h" #include "command/cmd_ac.h" diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 8babde06..fa55ec83 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -70,7 +70,7 @@ #include "tools/tinyurl.h" #include "xmpp/xmpp.h" #include "ui/ui.h" -#include "window_list.h" +#include "ui/window_list.h" #ifdef HAVE_LIBOTR #include "otr/otr.h" diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index b65c33f1..f68f725d 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -78,7 +78,7 @@ #include "tools/tinyurl.h" #include "xmpp/xmpp.h" #include "ui/ui.h" -#include "window_list.h" +#include "ui/window_list.h" #include "event/client_events.h" #ifdef HAVE_GTK #include "ui/tray.h" diff --git a/src/config/scripts.c b/src/config/scripts.c index 03ed6b99..04c4c1cd 100644 --- a/src/config/scripts.c +++ b/src/config/scripts.c @@ -42,7 +42,7 @@ #include "common.h" #include "log.h" -#include "window_list.h" +#include "ui/window_list.h" #include "command/cmd_defs.h" #include "ui/ui.h" #include "xmpp/xmpp.h" diff --git a/src/event/client_events.c b/src/event/client_events.c index 0107d496..4829133c 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -39,7 +39,7 @@ #include "log.h" #include "ui/ui.h" -#include "window_list.h" +#include "ui/window_list.h" #include "xmpp/xmpp.h" #include "xmpp/roster_list.h" #include "xmpp/chat_session.h" diff --git a/src/event/server_events.c b/src/event/server_events.c index 090a0fca..4adb3a2d 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -46,7 +46,7 @@ #include "config/scripts.h" #include "xmpp/roster_list.h" #include "plugins/plugins.h" -#include "window_list.h" +#include "ui/window_list.h" #include "config/tlscerts.h" #include "profanity.h" #include "event/client_events.h" diff --git a/src/otr/otr.c b/src/otr/otr.c index bcf64e66..27bd171b 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -42,7 +42,7 @@ #include "otr/otrlib.h" #include "log.h" #include "xmpp/roster_list.h" -#include "window_list.h" +#include "ui/window_list.h" #include "xmpp/contact.h" #include "ui/ui.h" #include "xmpp/xmpp.h" diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c index 1b11668b..74166808 100644 --- a/src/otr/otrlibv4.c +++ b/src/otr/otrlibv4.c @@ -37,7 +37,7 @@ #include #include "ui/ui.h" -#include "window_list.h" +#include "ui/window_list.h" #include "log.h" #include "otr/otr.h" #include "otr/otrlib.h" diff --git a/src/plugins/api.c b/src/plugins/api.c index e0abeceb..a0e69043 100644 --- a/src/plugins/api.c +++ b/src/plugins/api.c @@ -50,7 +50,7 @@ #include "ui/ui.h" #include "config/theme.h" #include "command/cmd_defs.h" -#include "window_list.h" +#include "ui/window_list.h" #include "common.h" void diff --git a/src/plugins/callbacks.c b/src/plugins/callbacks.c index bfe8a3c6..0bcdd34b 100644 --- a/src/plugins/callbacks.c +++ b/src/plugins/callbacks.c @@ -41,7 +41,7 @@ #include "plugins/plugins.h" #include "tools/autocomplete.h" #include "tools/parser.h" -#include "window_list.h" +#include "ui/window_list.h" #include "ui/ui.h" diff --git a/src/profanity.c b/src/profanity.c index 456cae3b..68f6bbb0 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -71,7 +71,7 @@ #include "xmpp/resource.h" #include "xmpp/xmpp.h" #include "ui/ui.h" -#include "window_list.h" +#include "ui/window_list.h" #include "event/client_events.h" #include "config/tlscerts.h" diff --git a/src/window_list.c b/src/ui/window_list.c similarity index 100% rename from src/window_list.c rename to src/ui/window_list.c diff --git a/src/window_list.h b/src/ui/window_list.h similarity index 98% rename from src/window_list.h rename to src/ui/window_list.h index ac8aa2fe..0f319ac8 100644 --- a/src/window_list.h +++ b/src/ui/window_list.h @@ -32,8 +32,8 @@ * */ -#ifndef WINDOW_LIST_H -#define WINDOW_LIST_H +#ifndef UI_WINDOW_LIST_H +#define UI_WINDOW_LIST_H #include "ui/ui.h" diff --git a/src/xmpp/chat_state.c b/src/xmpp/chat_state.c index 836d313f..66c24265 100644 --- a/src/xmpp/chat_state.c +++ b/src/xmpp/chat_state.c @@ -39,7 +39,7 @@ #include "chat_state.h" #include "xmpp/chat_session.h" -#include "window_list.h" +#include "ui/window_list.h" #include "ui/win_types.h" #include "xmpp/xmpp.h" #include "config/preferences.h" diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 954faf5d..c5f75ed0 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -54,7 +54,7 @@ #include "muc.h" #include "profanity.h" #include "ui/ui.h" -#include "window_list.h" +#include "ui/window_list.h" #include "config/preferences.h" #include "event/server_events.h" #include "xmpp/capabilities.h" diff --git a/src/xmpp/muc.c b/src/xmpp/muc.c index 884ddd34..83766c80 100644 --- a/src/xmpp/muc.c +++ b/src/xmpp/muc.c @@ -43,7 +43,7 @@ #include "xmpp/jid.h" #include "tools/autocomplete.h" #include "ui/ui.h" -#include "window_list.h" +#include "ui/window_list.h" #include "muc.h" typedef struct _muc_room_t { diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c index ab03e7d4..c1a46fc1 100644 --- a/tests/unittests/test_cmd_otr.c +++ b/tests/unittests/test_cmd_otr.c @@ -17,7 +17,7 @@ #include "command/cmd_defs.h" #include "command/cmd_funcs.h" -#include "window_list.h" +#include "ui/window_list.h" #include "xmpp/xmpp.h" #include "ui/ui.h"