DeforaOS/Mailer
DeforaOS/Mailer
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Use PROGNAME_COMPOSE instead of only PROGNAME

Browse Source
This commit is contained in:
Pierre Pronchery 2018-01-16 00:38:47 +01:00
parent 71711a0a63
commit d2fb06d08a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/compose.c
View File

@ -51,9 +51,6 @@
#ifndef PROGNAME_COMPOSE #ifndef PROGNAME_COMPOSE
# define PROGNAME_COMPOSE "compose" # define PROGNAME_COMPOSE "compose"
#endif #endif
#ifndef PROGNAME
# define PROGNAME PROGNAME_COMPOSE
#endif
#ifndef PROGNAME_MAILER #ifndef PROGNAME_MAILER
# define PROGNAME_MAILER "mailer" # define PROGNAME_MAILER "mailer"
#endif #endif
@ -867,7 +864,7 @@ int compose_error(Compose * compose, char const * message, int ret)
if(compose == NULL) if(compose == NULL)
return error_set_print(compose->standalone return error_set_print(compose->standalone
? PROGNAME : PROGNAME_MAILER, ? PROGNAME_COMPOSE : PROGNAME_MAILER,
ret, "%s", message); ret, "%s", message);
dialog = gtk_message_dialog_new(GTK_WINDOW(compose->window), dialog = gtk_message_dialog_new(GTK_WINDOW(compose->window),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
@ -1145,11 +1142,13 @@ static int _send_mail(Compose * compose, char * msg, size_t msg_len)
static int _mail_child(Compose * compose, int fd[2]) static int _mail_child(Compose * compose, int fd[2])
{ {
if(close(fd[1]) != 0 || close(0) != 0 || dup2(fd[0], 0) == -1) if(close(fd[1]) != 0 || close(0) != 0 || dup2(fd[0], 0) == -1)
perror(compose->standalone ? PROGNAME : PROGNAME_MAILER); perror(compose->standalone
? PROGNAME_COMPOSE : PROGNAME_MAILER);
else else
{ {
execl(SENDMAIL_PATH, PROGNAME_SENDMAIL, "-bm", "-t", NULL); execl(SENDMAIL_PATH, PROGNAME_SENDMAIL, "-bm", "-t", NULL);
fputs(PROGNAME ": ", stderr); fprintf(stderr, "%s: ", compose->standalone
? PROGNAME_COMPOSE : PROGNAME_MAILER);
perror(SENDMAIL_PATH); perror(SENDMAIL_PATH);
} }
_exit(2); _exit(2);
@ -1456,7 +1455,7 @@ static void _compose_on_contents(gpointer data)
Compose * compose = data; Compose * compose = data;
desktop_help_contents(PACKAGE, compose->standalone desktop_help_contents(PACKAGE, compose->standalone
? PROGNAME : PROGNAME_MAILER); ? PROGNAME_COMPOSE : PROGNAME_MAILER);
} }