debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: conform to same conditional build style as elsewhere in notmuch-show

Browse source 
Conform to the same style for #ifdef GMIME_ATLEAST_26 conditional
builds as elsewhere.

There are no functional changes.
This commit is contained in:
Jani Nikula 2013-03-30 15:53:17 +02:00 committed by David Bremner
parent d487ef9e58
commit 1c450ec5fa
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
notmuch-show.c
View file

@ -335,6 +335,8 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out,
} }
#ifdef GMIME_ATLEAST_26 #ifdef GMIME_ATLEAST_26
/* Get signature status string (GMime 2.6) */
static const char* static const char*
signature_status_to_string (GMimeSignatureStatus x) signature_status_to_string (GMimeSignatureStatus x)
{ {
@ -348,25 +350,8 @@ signature_status_to_string (GMimeSignatureStatus x)
} }
return "unknown"; return "unknown";
} }
#else
static const char*
signer_status_to_string (GMimeSignerStatus x)
{
switch (x) {
case GMIME_SIGNER_STATUS_NONE:
return "none";
case GMIME_SIGNER_STATUS_GOOD:
return "good";
case GMIME_SIGNER_STATUS_BAD:
return "bad";
case GMIME_SIGNER_STATUS_ERROR:
return "error";
}
return "unknown";
}
#endif
#ifdef GMIME_ATLEAST_26 /* Signature status sprinter (GMime 2.6) */
static void static void
format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
{ {
@ -441,7 +426,27 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
sp->end (sp); sp->end (sp);
} }
#else
#else /* GMIME_ATLEAST_26 */
/* Get signature status string (GMime 2.4) */
static const char*
signer_status_to_string (GMimeSignerStatus x)
{
switch (x) {
case GMIME_SIGNER_STATUS_NONE:
return "none";
case GMIME_SIGNER_STATUS_GOOD:
return "good";
case GMIME_SIGNER_STATUS_BAD:
return "bad";
case GMIME_SIGNER_STATUS_ERROR:
return "error";
}
return "unknown";
}
/* Signature status sprinter (GMime 2.4) */
static void static void
format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
{ {
@ -504,7 +509,8 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
sp->end (sp); sp->end (sp);
} }
#endif
#endif /* GMIME_ATLEAST_26 */
static notmuch_status_t static notmuch_status_t
format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,