2008-06-13 [mones] 3.4.0cvs95

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 97ce9ed4fe2826bddbe4c83b99c4207b838e3ead..5cf0d18c46c126ad11c555bb52c29711f98fa0a7 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -124,6 +124,7 @@
 #include "hooks.h"
 #include "privacy.h"
 #include "timing.h"
+#include "autofaces.h"
 
 enum
 {
@@ -6025,6 +6026,20 @@ static gchar *compose_get_header(Compose *compose)
                }
        }
 
+       /* Automatic Faces and X-Faces */
+       if (get_account_xface (buf, sizeof(buf), compose->account->account_name) == 0) {
+               g_string_append_printf(header, "X-Face: %s\n", buf);
+       }
+       else if (get_default_xface (buf, sizeof(buf)) == 0) {
+               g_string_append_printf(header, "X-Face: %s\n", buf);
+       }
+       if (get_account_face (buf, sizeof(buf), compose->account->account_name) == 0) {
+               g_string_append_printf(header, "Face: %s\n", buf);
+       }
+       else if (get_default_face (buf, sizeof(buf)) == 0) {
+               g_string_append_printf(header, "Face: %s\n", buf);
+       }
+
        /* PRIORITY */
        switch (compose->priority) {
                case PRIORITY_HIGHEST: g_string_append_printf(header, "Importance: high\n"