diff --git a/lib/mu-str.h b/lib/mu-str.h index 79f9613c..6cae11bd 100644 --- a/lib/mu-str.h +++ b/lib/mu-str.h @@ -25,8 +25,8 @@ #include #include -#include "lib/mu-msg.h" -#include "lib/mu-flags.h" +#include +#include G_BEGIN_DECLS diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 7765ed08..98c44aca 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -91,38 +91,57 @@ libtestmucommon_la_LIBADD= ../libmu.la # test messages, the '.ignore' message should be ignored # when indexing -EXTRA_DIST= \ - testdir/tmp/1220863087.12663.ignore \ - testdir/new/1220863087.12663_9.mindcrime \ - testdir/new/1220863087.12663_25.mindcrime \ - testdir/new/1220863087.12663_21.mindcrime \ - testdir/new/1220863087.12663_23.mindcrime \ - testdir/cur/1220863087.12663_5.mindcrime!2,S \ - testdir/cur/1220863087.12663_7.mindcrime!2,RS \ - testdir/cur/1220863087.12663_15.mindcrime!2,PS \ - testdir/cur/1220863087.12663_19.mindcrime!2,S \ - testdir/cur/1220863042.12663_1.mindcrime!2,S \ - testdir/cur/1220863060.12663_3.mindcrime!2,S \ - testdir/cur/1283599333.1840_11.cthulhu!2, \ - testdir/cur/1305664394.2171_402.cthulhu!2, \ - testdir/cur/1252168370_3.14675.cthulhu!2,S \ - testdir/cur/signed!2,S \ - testdir/cur/encrypted!2,S \ - testdir/cur/signed-encrypted!2,S \ - testdir/cur/multimime!2,FS \ - testdir2/bar/cur/mail1 \ - testdir2/bar/cur/mail2 \ - testdir2/bar/cur/mail3 \ - testdir2/bar/cur/mail4 \ - testdir2/bar/cur/mail5 \ - testdir2/bar/cur/181736.eml \ - testdir2/bar/cur/mail6 \ - testdir2/bar/tmp/.noindex \ - testdir2/bar/new/.noindex \ - testdir2/Foo/cur/mail5 \ - testdir2/Foo/cur/arto.eml \ - testdir2/Foo/tmp/.noindex \ - testdir2/Foo/new/.noindex \ - testdir2/wom_bat/cur/atomic \ - testdir2/wom_bat/cur/rfc822.1 \ - testdir2/wom_bat/cur/rfc822.2 +EXTRA_DIST= \ + testdir/tmp/1220863087.12663.ignore \ + testdir/new/1220863087.12663_9.mindcrime \ + testdir/new/1220863087.12663_25.mindcrime \ + testdir/new/1220863087.12663_21.mindcrime \ + testdir/new/1220863087.12663_23.mindcrime \ + testdir/cur/1220863087.12663_5.mindcrime!2,S \ + testdir/cur/1220863087.12663_7.mindcrime!2,RS \ + testdir/cur/1220863087.12663_15.mindcrime!2,PS \ + testdir/cur/1220863087.12663_19.mindcrime!2,S \ + testdir/cur/1220863042.12663_1.mindcrime!2,S \ + testdir/cur/1220863060.12663_3.mindcrime!2,S \ + testdir/cur/1283599333.1840_11.cthulhu!2, \ + testdir/cur/1305664394.2171_402.cthulhu!2, \ + testdir/cur/1252168370_3.14675.cthulhu!2,S \ + testdir/cur/signed!2,S \ + testdir/cur/encrypted!2,S \ + testdir/cur/signed-encrypted!2,S \ + testdir/cur/multimime!2,FS \ + testdir2/bar/cur/mail1 \ + testdir2/bar/cur/mail2 \ + testdir2/bar/cur/mail3 \ + testdir2/bar/cur/mail4 \ + testdir2/bar/cur/mail5 \ + testdir2/bar/cur/181736.eml \ + testdir2/bar/cur/mail6 \ + testdir2/bar/tmp/.noindex \ + testdir2/bar/new/.noindex \ + testdir2/Foo/cur/mail5 \ + testdir2/Foo/cur/arto.eml \ + testdir2/Foo/tmp/.noindex \ + testdir2/Foo/new/.noindex \ + testdir2/wom_bat/cur/atomic \ + testdir2/wom_bat/cur/rfc822.1 \ + testdir2/wom_bat/cur/rfc822.2 \ + testdir3/cycle \ + testdir3/cycle/new/.noindex \ + testdir3/cycle/cur/rogue0 \ + testdir3/cycle/cur/cycle0 \ + testdir3/cycle/cur/cycle0.0 \ + testdir3/cycle/cur/cycle0.0.0 \ + testdir3/cycle/tmp/.noindex \ + testdir3/tree/new/.noindex \ + testdir3/tree/cur/child0.0 \ + testdir3/tree/cur/child4.0 \ + testdir3/tree/cur/root2 \ + testdir3/tree/cur/root1 \ + testdir3/tree/cur/child3.0.0.0.0 \ + testdir3/tree/cur/root0 \ + testdir3/tree/cur/child2.0.0 \ + testdir3/tree/cur/child0.1 \ + testdir3/tree/cur/child0.1.0 \ + testdir3/tree/cur/child4.1 \ + testdir3/tree/tmp/.noindex diff --git a/src/tests/testdir/cur/multimime!2,FS b/lib/tests/testdir/cur/multimime!2,FS similarity index 100% rename from src/tests/testdir/cur/multimime!2,FS rename to lib/tests/testdir/cur/multimime!2,FS diff --git a/widgets/mu-msg-attach-view.c b/widgets/mu-msg-attach-view.c index 122e4bbf..1a79afa3 100644 --- a/widgets/mu-msg-attach-view.c +++ b/widgets/mu-msg-attach-view.c @@ -19,7 +19,7 @@ #include "mu-msg-attach-view.h" #include "mu-widget-util.h" -#include +#include enum { ICON_COL, diff --git a/widgets/mu-msg-attach-view.h b/widgets/mu-msg-attach-view.h index d49b02fa..f558c2c9 100644 --- a/widgets/mu-msg-attach-view.h +++ b/widgets/mu-msg-attach-view.h @@ -22,7 +22,7 @@ #define __MU_MSG_ATTACH_VIEW_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/widgets/mu-msg-header-view.c b/widgets/mu-msg-header-view.c index 2509cb21..26f62fba 100644 --- a/widgets/mu-msg-header-view.c +++ b/widgets/mu-msg-header-view.c @@ -19,8 +19,8 @@ #include "mu-msg-header-view.h" -#include -#include +#include +#include #if HAVE_CONFIG_H #include diff --git a/widgets/mu-msg-view.c b/widgets/mu-msg-view.c index 3cf0419a..5ae1cbe4 100644 --- a/widgets/mu-msg-view.c +++ b/widgets/mu-msg-view.c @@ -25,7 +25,7 @@ #include "mu-msg-body-view.h" #include "mu-msg-header-view.h" #include "mu-msg-attach-view.h" -#include +#include /* 'private'/'protected' functions */