Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Mon, 28 Apr 2014 11:07:33 +0000 (13:07 +0200)
committerColin Leroy <colin@colino.net>
Mon, 28 Apr 2014 11:07:33 +0000 (13:07 +0200)
src/plugins/vcalendar/vcal_folder.c
src/prefs_themes.c

index 59718b6de7dc9938e8ac4c6b82a48b02d6119a0b..e18240a95a9dbe0e1ded0b13df2e4ffaea6ecb66 100644 (file)
@@ -42,6 +42,7 @@
 #include "procheader.h"
 #include "folder.h"
 #include "folderview.h"
+#include "folder_item_prefs.h"
 #include "vcalendar.h"
 #include "vcal_folder.h"
 #include "vcal_prefs.h"
index 480de3394ead74aaf068e219dee0f951c091f79b..9f02566754f5cddd096bba87d2fbdacfddd649d5 100644 (file)
@@ -45,6 +45,7 @@
 #include "mainwindow.h"
 #include "compose.h"
 #include "alertpanel.h"
+#include "addr_compl.h"
 
 #define IS_CURRENT_THEME(path)  (strcmp(prefs_common.pixmap_theme_path, path) == 0)
 #define IS_INTERNAL_THEME(path) (strcmp(DEFAULT_PIXMAP_THEME, path) == 0)