Revert "debian: Generate version from debian/changelog"

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index b9a41cc653e4bab6f277e85d7d9d173a33711b7f..fb7430081f2600cbf3747652b227c182866553e2 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -420,7 +420,7 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out)
 }
 
 static const char*
-signerstatustostring (GMimeSignerStatus x)
+signer_status_to_string (GMimeSignerStatus x)
 {
     switch (x) {
     case GMIME_SIGNER_STATUS_NONE:
@@ -454,23 +454,25 @@ format_part_start_text (GMimeObject *part, int *part_count)
 static void
 format_part_content_text (GMimeObject *part)
 {
-    GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
+    const char *cid = g_mime_object_get_content_id (part);
     GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
-    GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
-
-    printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));
 
-    if (disposition &&
-       strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+    if (GMIME_IS_PART (part))
     {
        const char *filename = g_mime_part_get_filename (GMIME_PART (part));
-       printf ("Attachment: %s (%s)\n", filename,
-               g_mime_content_type_to_string (content_type));
+       if (filename)
+           printf (", Filename: %s", filename);
     }
 
+    if (cid)
+       printf (", Content-id: %s", cid);
+
+    printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));
+
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
        !g_mime_content_type_is_type (content_type, "text", "html"))
     {
+       GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
        g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
        show_text_part_content (part, stream_stdout);
        g_object_unref(stream_stdout);
@@ -546,7 +548,9 @@ format_part_sigstatus_json (const GMimeSignatureValidity* validity)
        printf ("{");
 
        /* status */
-       printf ("\"status\": %s", json_quote_str (ctx_quote, signerstatustostring(signer->status)));
+       printf ("\"status\": %s",
+               json_quote_str (ctx_quote,
+                               signer_status_to_string (signer->status)));
 
        if (signer->status == GMIME_SIGNER_STATUS_GOOD)
        {
@@ -589,7 +593,6 @@ format_part_content_json (GMimeObject *part)
     GMimeStream *stream_memory = g_mime_stream_mem_new ();
     const char *cid = g_mime_object_get_content_id (part);
     void *ctx = talloc_new (NULL);
-    GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
     GByteArray *part_content;
 
     printf (", \"content-type\": %s",
@@ -598,12 +601,11 @@ format_part_content_json (GMimeObject *part)
     if (cid != NULL)
            printf(", \"content-id\": %s", json_quote_str (ctx, cid));
 
-    if (disposition &&
-       strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+    if (GMIME_IS_PART (part))
     {
        const char *filename = g_mime_part_get_filename (GMIME_PART (part));
-
-       printf (", \"filename\": %s", json_quote_str (ctx, filename));
+       if (filename)
+           printf (", \"filename\": %s", json_quote_str (ctx, filename));
     }
 
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
@@ -897,7 +899,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
        } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) ||
                   (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
            if (params.cryptoctx == NULL) {
-               GMimeSession* session = g_object_new(notmuch_gmime_session_get_type(), NULL);
+               GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL);
                if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg")))
                    fprintf (stderr, "Failed to construct gpg context.\n");
                else