From 4a7a0f3e76314bac90fd965ff3f8932c936fd02b Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 23 Mar 2020 12:33:42 +0100 Subject: db: move includes --- src/database.c | 5 +---- src/database.h | 8 ++++++-- src/event/common.c | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/database.c b/src/database.c index de1d36fb..853879f6 100644 --- a/src/database.c +++ b/src/database.c @@ -38,13 +38,10 @@ #include #include #include -#include #include #include "log.h" #include "config/files.h" -#include "config/account.h" -#include "xmpp/xmpp.h" static sqlite3 *g_chatlog_database; @@ -80,7 +77,7 @@ _get_db_filename(ProfAccount *account) return result; } -bool +gboolean log_database_init(ProfAccount *account) { int ret = sqlite3_initialize(); diff --git a/src/database.h b/src/database.h index 82fa6aaa..9281e6e6 100644 --- a/src/database.h +++ b/src/database.h @@ -36,9 +36,13 @@ #ifndef DATABASE_H #define DATABASE_H -bool log_database_init(ProfAccount *account); -void log_database_close(void); +#include +#include "config/account.h" +#include "xmpp/xmpp.h" + +gboolean log_database_init(ProfAccount *account); void log_database_add(ProfMessage *message, gboolean is_muc); +void log_database_close(void); #endif // DATABASE_H diff --git a/src/event/common.c b/src/event/common.c index 4dc62b07..2d829e5c 100644 --- a/src/event/common.c +++ b/src/event/common.c @@ -33,13 +33,13 @@ * */ -#include "database.h" #include "config/tlscerts.h" #include "ui/ui.h" #include "xmpp/chat_session.h" #include "xmpp/roster_list.h" #include "xmpp/muc.h" #include "xmpp/xmpp.h" +#include "database.h" #ifdef HAVE_LIBGPGME #include "pgp/gpg.h" -- cgit 1.4.1-2-gfad0