projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less and less cruft: always compile socket support in
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
2b0c41f
..
0bf733c
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-503,7
+503,7
@@
void mutt_set_parameter (const char *attribute, const char *value,
for (q = *p; q; q = q->next) {
if (ascii_strcasecmp (attribute, q->attribute) == 0) {
for (q = *p; q; q = q->next) {
if (ascii_strcasecmp (attribute, q->attribute) == 0) {
-
str_replace
(&q->value, value);
+
m_strreplace
(&q->value, value);
return;
}
}
return;
}
}
@@
-542,9
+542,9
@@
int mutt_needs_mailcap (BODY * m)
break;
case TYPEAPPLICATION:
break;
case TYPEAPPLICATION:
- if (
(WithCrypto & APPLICATION_PGP) &&
mutt_is_application_pgp (m))
+ if (mutt_is_application_pgp (m))
return 0;
return 0;
- if (
(WithCrypto & APPLICATION_SMIME) &&
mutt_is_application_smime (m))
+ if (mutt_is_application_smime (m))
return 0;
break;
return 0;
break;
@@
-561,7
+561,7
@@
int mutt_is_text_part (BODY * b)
int t = b->type;
char *s = b->subtype;
int t = b->type;
char *s = b->subtype;
- if (
(WithCrypto & APPLICATION_PGP) &&
mutt_is_application_pgp (b))
+ if (mutt_is_application_pgp (b))
return 0;
if (t == TYPETEXT)
return 0;
if (t == TYPETEXT)
@@
-572,7
+572,7
@@
int mutt_is_text_part (BODY * b)
return 1;
}
return 1;
}
- if (
(WithCrypto & APPLICATION_PGP) &&
t == TYPEAPPLICATION) {
+ if (t == TYPEAPPLICATION) {
if (!ascii_strcasecmp ("pgp-keys", s))
return 1;
}
if (!ascii_strcasecmp ("pgp-keys", s))
return 1;
}
@@
-829,7
+829,7
@@
int mutt_check_overwrite (const char *attname, const char *path,
(_("File is a directory, save under it? [(y)es, (n)o, (a)ll]"),
_("yna"))) {
case 3: /* all */
(_("File is a directory, save under it? [(y)es, (n)o, (a)ll]"),
_("yna"))) {
case 3: /* all */
-
str_replace
(directory, fname);
+
m_strreplace
(directory, fname);
break;
case 1: /* yes */
p_delete(directory);
break;
case 1: /* yes */
p_delete(directory);
@@
-889,7
+889,7
@@
void mutt_save_path (char *d, size_t dsize, address_t * a)
if ((p = strpbrk (d, "%@")))
*p = 0;
}
if ((p = strpbrk (d, "%@")))
*p = 0;
}
-
str_tolower
(d);
+
m_strtolower
(d);
}
else
*d = 0;
}
else
*d = 0;
@@
-1070,7
+1070,7
@@
void mutt_FormatString (char *dest, /* output buffer */
data, flags);
if (lower)
data, flags);
if (lower)
-
str_tolower
(buf);
+
m_strtolower
(buf);
if (nodots) {
char *p = buf;
if (nodots) {
char *p = buf;