lib/cli: pass GMIME_ENABLE_RFC2047_WORKAROUNDS to g_mime_init()

[notmuch] / notmuch.c

diff --git a/notmuch.c b/notmuch.c
index f51a84f5e1f55c89aaf974f6de68aaac855e2272..7300c2145ea7c552aa7169a32870e5a154b8453a 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -28,7 +28,6 @@ typedef struct command {
     const char *name;
     command_function_t function;
     notmuch_bool_t create_config;
-    const char *arguments;
     const char *summary;
 } command_t;
 
@@ -40,40 +39,30 @@ notmuch_command (notmuch_config_t *config, int argc, char *argv[]);
 
 static command_t commands[] = {
     { NULL, notmuch_command, TRUE,
-      NULL,
       "Notmuch main command." },
     { "setup", notmuch_setup_command, TRUE,
-      NULL,
       "Interactively setup notmuch for first use." },
     { "new", notmuch_new_command, FALSE,
-      "[options...]",
       "Find and import new messages to the notmuch database." },
+    { "insert", notmuch_insert_command, FALSE,
+      "Add a new message into the maildir and notmuch database." },
     { "search", notmuch_search_command, FALSE,
-      "[options...] <search-terms> [...]",
       "Search for messages matching the given search terms." },
     { "show", notmuch_show_command, FALSE,
-      "<search-terms> [...]",
       "Show all messages matching the search terms." },
     { "count", notmuch_count_command, FALSE,
-      "[options...] <search-terms> [...]",
       "Count messages matching the search terms." },
     { "reply", notmuch_reply_command, FALSE,
-      "[options...] <search-terms> [...]",
       "Construct a reply template for a set of messages." },
     { "tag", notmuch_tag_command, FALSE,
-      "+<tag>|-<tag> [...] [--] <search-terms> [...]" ,
       "Add/remove tags for all messages matching the search terms." },
     { "dump", notmuch_dump_command, FALSE,
-      "[<filename>] [--] [<search-terms>]",
       "Create a plain-text dump of the tags for each message." },
     { "restore", notmuch_restore_command, FALSE,
-      "[--accumulate] [<filename>]",
       "Restore the tags from the given dump file (see 'dump')." },
     { "config", notmuch_config_command, FALSE,
-      "[get|set] <section>.<item> [value ...]",
       "Get or set settings in the notmuch configuration file." },
     { "help", notmuch_help_command, TRUE, /* create but don't save config */
-      "[<command>]",
       "This message, or more detailed help for the named command." }
 };
 
@@ -275,8 +264,10 @@ main (int argc, char *argv[])
 
     local = talloc_new (NULL);
 
-    g_mime_init (0);
+    g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
+#if !GLIB_CHECK_VERSION(2, 35, 1)
     g_type_init ();
+#endif
 
     /* Globally default to the current output format version. */
     notmuch_format_version = NOTMUCH_FORMAT_CUR;