diff options
author | James Booth <boothj5@gmail.com> | 2015-06-15 20:39:17 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-06-15 20:39:17 +0100 |
commit | c76692516a65af35249e93071a6478fd9d799fff (patch) | |
tree | 33cc0f7c7ec700e86a4ee81a2588ff8ba06ad60f /src/event | |
parent | b52de6869a2d22426eb77ae62c17514fb8520308 (diff) | |
parent | 5cdd69f478e6bbd4b8b0ca03daab56e6206c3ab2 (diff) | |
download | profani-tty-c76692516a65af35249e93071a6478fd9d799fff.tar.gz |
Merge branch 'master' into openpgp
Diffstat (limited to 'src/event')
-rw-r--r-- | src/event/client_events.c | 2 | ||||
-rw-r--r-- | src/event/ui_events.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/event/client_events.c b/src/event/client_events.c index 3feeeca1..a1cff93d 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -37,7 +37,7 @@ #include "config.h" #include "log.h" #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" #include "xmpp/xmpp.h" #ifdef HAVE_LIBOTR #include "otr/otr.h" diff --git a/src/event/ui_events.c b/src/event/ui_events.c index ff1d7273..11296739 100644 --- a/src/event/ui_events.c +++ b/src/event/ui_events.c @@ -33,7 +33,7 @@ */ #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" void ui_ev_focus_win(ProfWin *win) @@ -53,4 +53,4 @@ ProfPrivateWin* ui_ev_new_private_win(const char * const fulljid) { return ui_new_private_win(fulljid); -} \ No newline at end of file +} |