[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-238-g2d2a6e3
ticho at claws-mail.org
ticho at claws-mail.org
Sat Jun 23 22:25:07 CEST 2018
The branch, gtk3 has been updated
via 2d2a6e37fe885c58792666b8967aea91fee602cc (commit)
via f5c1429ae49b97856b69d26e75f042ee063bd091 (commit)
via 76749107d9c34aa0ae7d9e8358742565006b21af (commit)
via 569fdb0a7ca201733b12cda840e8abef1433ec59 (commit)
via 968a6c35953898a778e965120f1e3974648916f9 (commit)
via 6325a9faded440be9d485a41a568caff2da80a00 (commit)
via 4bcaf5e3be54eb45744e2db3057d5ddb38e8aebf (commit)
via 199a99717edfe3d9600658af000eb13514e66034 (commit)
via 91bc6b055d73cba877dd0eb0632792c6ac4cefa1 (commit)
via fa42bca6ef8540e676b56e18f541eded201869a7 (commit)
via d982809f6a0e8486231d6b69ed990c54ecdd65d5 (commit)
via be0082cc1a7c2251f2aa6fd5b868b8bd6716da51 (commit)
via 297bdda305f67d0ea4c86d36e395700fc156ccb5 (commit)
via db088bee558c410b5ef4fecdd3359b33b46ab03a (commit)
via 779857e7e158504b443f92927deacdb883373f36 (commit)
from afb888f0752b0a72c540686bcc87a6f09e3d6ac8 (commit)
Summary of changes:
src/account.c | 10 ++++++
src/inc.c | 2 +-
src/matcher.c | 8 +++--
src/messageview.c | 17 ++--------
src/plugins/archive/archiver.c | 2 +-
src/plugins/archive/archiver.h | 2 +-
src/plugins/archive/archiver_gtk.c | 2 +-
src/plugins/archive/archiver_prefs.c | 2 +-
src/plugins/archive/archiver_prefs.h | 2 +-
src/plugins/archive/libarchive_archive.c | 51 +++++++++++++++++-------------
src/plugins/archive/libarchive_archive.h | 2 +-
src/plugins/libravatar/libravatar.c | 8 +++--
src/plugins/rssyl/strutils.c | 2 +-
src/prefs_account.c | 7 ++--
src/prefs_gtk.c | 2 --
src/prefs_matcher.c | 2 +-
src/prefs_proxy.c | 4 +--
src/textview.c | 15 ++++++---
18 files changed, 78 insertions(+), 62 deletions(-)
- Log -----------------------------------------------------------------
commit 2d2a6e37fe885c58792666b8967aea91fee602cc
Author: Paul <paul at claws-mail.org>
Date: Fri Jun 22 10:55:02 2018 +0100
strip whitespace from subscribed URLs
diff --git a/src/plugins/rssyl/strutils.c b/src/plugins/rssyl/strutils.c
index 7d172c8..b455a75 100644
--- a/src/plugins/rssyl/strutils.c
+++ b/src/plugins/rssyl/strutils.c
@@ -299,5 +299,5 @@ gchar *my_normalize_url(const gchar *url)
else
myurl = g_strdup(url);
- return myurl;
+ return g_strstrip(myurl);
}
commit f5c1429ae49b97856b69d26e75f042ee063bd091
Author: Paul <paul at claws-mail.org>
Date: Thu Jun 21 10:54:11 2018 +0100
fix bug, 'MDN mail-accountname leak'
always use whatever is in the To header for the From header when sending
Return Receipts
diff --git a/src/messageview.c b/src/messageview.c
index 1e675b6..c0db9b0 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -970,19 +970,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
goto FILE_ERROR;
/* From */
- if (account->name && *account->name) {
- notification_convert_header(&buf, account->name, strlen("From: "));
- if (buf == NULL)
- goto FILE_ERROR;
- if (fprintf(fp, "From: %s <%s>\n", buf, account->address) < 0) {
- g_free(buf);
- goto FILE_ERROR;
- }
- g_free(buf);
- buf = NULL;
- } else
- if (fprintf(fp, "From: %s\n", account->address) < 0)
- goto FILE_ERROR;
+ if (fprintf(fp, "From: %s\n", msginfo->to) < 0)
+ goto FILE_ERROR;
if (fprintf(fp, "To: %s\n", to) < 0)
goto FILE_ERROR;
commit 76749107d9c34aa0ae7d9e8358742565006b21af
Author: Ricardo Mones <ricardo at mones.org>
Date: Tue Jun 19 11:12:02 2018 +0200
Default mode URL should be escaped before using it
diff --git a/src/plugins/libravatar/libravatar.c b/src/plugins/libravatar/libravatar.c
index de5100a..41290aa 100644
--- a/src/plugins/libravatar/libravatar.c
+++ b/src/plugins/libravatar/libravatar.c
@@ -210,9 +210,11 @@ static gchar *libravatar_url_for_md5(const gchar *base, const gchar *md5)
base, md5, AVATAR_SIZE,
def_mode[libravatarprefs.default_mode - 10]);
} else if (libravatarprefs.default_mode == DEF_MODE_URL) {
- return g_strdup_printf("%s/%s?s=%u&d=%s",
- base, md5, AVATAR_SIZE,
- libravatarprefs.default_mode_url);
+ gchar *escaped = g_uri_escape_string(libravatarprefs.default_mode_url, "/", TRUE);
+ gchar *url = g_strdup_printf("%s/%s?s=%u&d=%s",
+ base, md5, AVATAR_SIZE, escaped);
+ g_free(escaped);
+ return url;
} else if (libravatarprefs.default_mode == DEF_MODE_NONE) {
return g_strdup_printf("%s/%s?s=%u",
base, md5, AVATAR_SIZE);
commit 569fdb0a7ca201733b12cda840e8abef1433ec59
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Sun Jun 17 15:19:20 2018 +0200
Fix 'Invalid PrefType for GtkEntry' warning for account proxy_pass.
Also remove P_PASSWORD as valid PrefType in prefs_set_data_from_entry().
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 742f5c2..25c8569 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -843,8 +843,7 @@ static PrefParam proxy_param[] = {
prefs_set_data_from_entry, prefs_set_entry},
{"proxy_pass", "", &tmp_ac_prefs.proxy_info.proxy_pass, P_PASSWORD,
- &proxy_page.proxy_pass_entry,
- prefs_set_data_from_entry, prefs_set_entry},
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index b5e28f3..8b00dc1 100644
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -631,8 +631,6 @@ void prefs_set_data_from_entry(PrefParam *pparam)
g_free(*str);
*str = entry_str[0] ? g_strdup(entry_str) : NULL;
break;
- case P_PASSWORD:
- break;
case P_USHORT:
*((gushort *)pparam->data) = atoi(entry_str);
break;
commit 968a6c35953898a778e965120f1e3974648916f9
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Sun Jun 17 13:14:58 2018 +0200
Clone also proxy-related prefs in account_clone().
diff --git a/src/account.c b/src/account.c
index b3a92da..b51e7b8 100644
--- a/src/account.c
+++ b/src/account.c
@@ -1055,6 +1055,16 @@ static void account_clone(GtkWidget *widget, gpointer data)
ACP_FASSIGN(config_version);
+ ACP_FASSIGN(use_proxy);
+ ACP_FASSIGN(use_default_proxy);
+ ACP_FASSIGN(use_proxy_for_send);
+ ACP_FASSIGN(proxy_info.proxy_type);
+ ACP_FDUP(proxy_info.proxy_host);
+ ACP_FASSIGN(proxy_info.proxy_port);
+ ACP_FASSIGN(proxy_info.use_proxy_auth);
+ ACP_FDUP(proxy_info.proxy_name);
+ ACP_FDUP(proxy_info.proxy_pass);
+
account_list = g_list_append(account_list, ac_clon);
account_list_view_set();
}
commit 6325a9faded440be9d485a41a568caff2da80a00
Author: wwp <wwp at free.fr>
Date: Tue Jun 12 11:27:32 2018 +0200
Include Resent-From and Resent-To in Any/All header(s) (in addressbook) matcher rules.
diff --git a/src/matcher.c b/src/matcher.c
index 40ed4ca..ab42c75 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -1385,7 +1385,9 @@ static gboolean matcherprop_match_one_header(MatcherProp *matcher,
procheader_headername_equal(header->name, "To") ||
procheader_headername_equal(header->name, "Cc") ||
procheader_headername_equal(header->name, "Reply-To") ||
- procheader_headername_equal(header->name, "Sender"))
+ procheader_headername_equal(header->name, "Sender") ||
+ procheader_headername_equal(header->name, "Resent-From") ||
+ procheader_headername_equal(header->name, "Resent-To"))
address_list = address_list_append(address_list, header->body);
procheader_header_free(header);
if (address_list == NULL)
@@ -1496,7 +1498,9 @@ static gboolean matcherlist_match_headers(MatcherList *matchers, FILE *fp)
procheader_headername_equal(header->name, "To") ||
procheader_headername_equal(header->name, "Cc") ||
procheader_headername_equal(header->name, "Reply-To") ||
- procheader_headername_equal(header->name, "Sender"))) {
+ procheader_headername_equal(header->name, "Sender") ||
+ procheader_headername_equal(header->name, "Resent-From") ||
+ procheader_headername_equal(header->name, "Resent-To"))) {
if (strcasecmp(matcher->header, "Any") == 0)
match = MATCH_ANY;
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 26312ad..96b9169 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -703,7 +703,7 @@ static void prefs_matcher_create(void)
/* address header name */
header_addr_combo = combobox_text_new(TRUE,
C_("Filtering Matcher Menu", "All"), _("Any"),
- "From", "To", "Cc", "Reply-To", "Sender", NULL);
+ "From", "To", "Cc", "Reply-To", "Sender", "Resent-From", "Resent-To", NULL);
gtk_box_pack_start(GTK_BOX(match_hbox), header_addr_combo, FALSE, FALSE, 0);
header_addr_entry = gtk_bin_get_child(GTK_BIN((header_addr_combo)));
gtk_widget_set_size_request(header_addr_combo, 150, -1);
commit 4bcaf5e3be54eb45744e2db3057d5ddb38e8aebf
Author: wwp <wwp at free.fr>
Date: Tue Jun 12 10:52:12 2018 +0200
Clean up and unfold more standard headers (Bcc, Reply-To, Sender,
Resent-From and Resent-To).
diff --git a/src/textview.c b/src/textview.c
index 55dc5bd..ba5f46f 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -2294,9 +2294,14 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
"header_title", "header", NULL);
if (procheader_headername_equal(header->name, "Subject") ||
- procheader_headername_equal(header->name, "From") ||
- procheader_headername_equal(header->name, "To") ||
- procheader_headername_equal(header->name, "Cc"))
+ procheader_headername_equal(header->name, "From") ||
+ procheader_headername_equal(header->name, "To") ||
+ procheader_headername_equal(header->name, "Cc") ||
+ procheader_headername_equal(header->name, "Bcc") ||
+ procheader_headername_equal(header->name, "Reply-To") ||
+ procheader_headername_equal(header->name, "Sender") ||
+ procheader_headername_equal(header->name, "Resent-From") ||
+ procheader_headername_equal(header->name, "Resent-To"))
unfold_line(header->body);
if (procheader_headername_equal(header->name, "Date") &&
commit 199a99717edfe3d9600658af000eb13514e66034
Author: wwp <wwp at free.fr>
Date: Tue Jun 12 10:26:38 2018 +0200
Properly highlight the whole email address in Resent-From and Resent-To
headers.
diff --git a/src/textview.c b/src/textview.c
index 55276d8..55dc5bd 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -2323,7 +2323,9 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
procheader_headername_equal(header->name, "Cc") ||
procheader_headername_equal(header->name, "Bcc") ||
procheader_headername_equal(header->name, "Reply-To") ||
- procheader_headername_equal(header->name, "Sender");
+ procheader_headername_equal(header->name, "Sender") ||
+ procheader_headername_equal(header->name, "Resent-From") ||
+ procheader_headername_equal(header->name, "Resent-To");
textview_make_clickable_parts(textview, "header",
"hlink", header->body,
hdr);
commit 91bc6b055d73cba877dd0eb0632792c6ac4cefa1
Author: Michael Rasmussen <mir at datanom.net>
Date: Mon Jun 11 22:46:32 2018 +0200
Fix a possible memory leak
Signed-off-by: Michael Rasmussen <mir at datanom.net>
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index 4ee3b6b..ed37ed5 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -589,7 +589,6 @@ const gchar* archive_create(const char* archive_name, GSList* files,
set_progress_file_label(msg);
g_free(msg);
#endif
- entry = archive_entry_new();
if ((fd = g_open(filename, O_RDONLY, 0)) == -1) {
FILE_OP_ERROR(filename, "g_open");
}
@@ -597,6 +596,7 @@ const gchar* archive_create(const char* archive_name, GSList* files,
if (g_stat(filename, &st) == -1) {
FILE_OP_ERROR(filename, "g_stat");
} else {
+ entry = archive_entry_new();
archive_entry_copy_stat(entry, &st);
archive_entry_set_pathname(entry, filename);
if (S_ISLNK(st.st_mode)) {
@@ -625,10 +625,10 @@ const gchar* archive_create(const char* archive_name, GSList* files,
g_free(buf);
}
}
+ archive_entry_free(entry);
}
if (!g_close(fd, &err) || err)
FILE_OP_ERROR(filename, "g_close");
- archive_entry_free(entry);
}
}
g_free(filename);
commit fa42bca6ef8540e676b56e18f541eded201869a7
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Mon Jun 11 21:17:07 2018 +0200
Fix memory corruption introduced in d28d62772.
diff --git a/src/inc.c b/src/inc.c
index f0455e3..4d9f341 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -846,7 +846,7 @@ static IncState inc_pop3_session_do(IncSession *session)
PWS_ACCOUNT_PROXY_PASS);
}
}
- SESSION(session)->proxy_info = proxy_info;
+ SESSION(pop3_session)->proxy_info = proxy_info;
GTK_EVENTS_FLUSH();
g_free(buf);
commit d982809f6a0e8486231d6b69ed990c54ecdd65d5
Author: wwp <wwp at free.fr>
Date: Mon Jun 11 19:12:20 2018 +0200
Reduce scope of few variables.
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index 7ee669b..4ee3b6b 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -441,13 +441,6 @@ const gchar* archive_extract(const char* archive_name, int flags) {
const gchar* archive_create(const char* archive_name, GSList* files,
COMPRESS_METHOD method, ARCHIVE_FORMAT format) {
struct archive* arch;
- struct archive_entry* entry;
- char* buf = NULL;
- ssize_t len;
- int fd;
- struct file_info* file;
- gchar* filename = NULL;
- gchar* msg = NULL;
#ifndef _TEST
gint num = 0;
@@ -564,6 +557,9 @@ const gchar* archive_create(const char* archive_name, GSList* files,
return archive_error_string(arch);
while (files && ! stop_action) {
+ struct file_info* file;
+ gchar* filename = NULL;
+
#ifndef _TEST
set_progress_print_all(num++, total, 30);
#endif
@@ -579,8 +575,13 @@ const gchar* archive_create(const char* archive_name, GSList* files,
#endif
}
else {
+ struct archive_entry* entry;
+ char* buf = NULL;
+ ssize_t len;
GError* err = NULL;
GStatBuf st;
+ int fd;
+ gchar* msg = NULL;
#ifndef _TEST
debug_print("Adding: %s\n", filename);
commit be0082cc1a7c2251f2aa6fd5b868b8bd6716da51
Author: wwp <wwp at free.fr>
Date: Mon Jun 11 13:36:12 2018 +0200
Update copyright in file headers.
Make use of GLib API for few file operations.
diff --git a/src/plugins/archive/archiver.c b/src/plugins/archive/archiver.c
index cf689de..2a8dad5 100644
--- a/src/plugins/archive/archiver.c
+++ b/src/plugins/archive/archiver.c
@@ -2,7 +2,7 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/plugins/archive/archiver.h b/src/plugins/archive/archiver.h
index 4405547..42fde0b 100644
--- a/src/plugins/archive/archiver.h
+++ b/src/plugins/archive/archiver.h
@@ -2,7 +2,7 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/plugins/archive/archiver_gtk.c b/src/plugins/archive/archiver_gtk.c
index c798253..27ff539 100644
--- a/src/plugins/archive/archiver_gtk.c
+++ b/src/plugins/archive/archiver_gtk.c
@@ -2,7 +2,7 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/plugins/archive/archiver_prefs.c b/src/plugins/archive/archiver_prefs.c
index fdda401..826630a 100644
--- a/src/plugins/archive/archiver_prefs.c
+++ b/src/plugins/archive/archiver_prefs.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/plugins/archive/archiver_prefs.h b/src/plugins/archive/archiver_prefs.h
index 159b3c1..4da8c73 100644
--- a/src/plugins/archive/archiver_prefs.h
+++ b/src/plugins/archive/archiver_prefs.h
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index cc1c95c..7ee669b 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -445,7 +445,6 @@ const gchar* archive_create(const char* archive_name, GSList* files,
char* buf = NULL;
ssize_t len;
int fd;
- struct stat st;
struct file_info* file;
gchar* filename = NULL;
gchar* msg = NULL;
@@ -580,6 +579,9 @@ const gchar* archive_create(const char* archive_name, GSList* files,
#endif
}
else {
+ GError* err = NULL;
+ GStatBuf st;
+
#ifndef _TEST
debug_print("Adding: %s\n", filename);
msg = g_strdup_printf("%s", filename);
@@ -587,21 +589,21 @@ const gchar* archive_create(const char* archive_name, GSList* files,
g_free(msg);
#endif
entry = archive_entry_new();
- if ((fd = open(filename, O_RDONLY)) == -1) {
- FILE_OP_ERROR(filename, "open");
+ if ((fd = g_open(filename, O_RDONLY, 0)) == -1) {
+ FILE_OP_ERROR(filename, "g_open");
}
else {
- if (lstat(filename, &st) == -1) {
- FILE_OP_ERROR(filename, "lstat");
+ if (g_stat(filename, &st) == -1) {
+ FILE_OP_ERROR(filename, "g_stat");
} else {
archive_entry_copy_stat(entry, &st);
archive_entry_set_pathname(entry, filename);
if (S_ISLNK(st.st_mode)) {
- if ((buf = malloc(PATH_MAX + 1)) != NULL) {
- if ((len = readlink(filename, buf, PATH_MAX)) < 0) {
- FILE_OP_ERROR(filename, "readlink");
- } else
- buf[len] = '\0';
+
+ buf = g_file_read_link(filename, &err);
+ if (err) {
+ FILE_OP_ERROR(filename, "g_file_read_link");
+ } else {
archive_entry_set_symlink(entry, buf);
g_free(buf);
archive_entry_set_size(entry, 0);
@@ -623,7 +625,8 @@ const gchar* archive_create(const char* archive_name, GSList* files,
}
}
}
- close(fd);
+ if (!g_close(fd, &err) || err)
+ FILE_OP_ERROR(filename, "g_close");
archive_entry_free(entry);
}
}
@@ -665,7 +668,10 @@ void archive_scan_folder(const char* dir) {
while ((ent = readdir(root)) != NULL) {
if (strcmp(".", ent->d_name) == 0 || strcmp("..", ent->d_name) == 0)
continue;
- g_stat(ent->d_name, &st);
+ if (g_stat(ent->d_name, &st) == -1) {
+ FILE_OP_ERROR(filename, "g_stat");
+ continue;
+ }
sprintf(path, "%s/%s", dir, ent->d_name);
if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
archive_add_file(path);
diff --git a/src/plugins/archive/libarchive_archive.h b/src/plugins/archive/libarchive_archive.h
index 60207bc..4ceb2fe 100644
--- a/src/plugins/archive/libarchive_archive.h
+++ b/src/plugins/archive/libarchive_archive.h
@@ -2,7 +2,7 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Michael Rasmussen and the Claws Mail Team
+ * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
commit 297bdda305f67d0ea4c86d36e395700fc156ccb5
Author: wwp <wwp at free.fr>
Date: Mon Jun 11 10:02:37 2018 +0200
Remove un-necessary test, msginfo can't be null here, solves CID#1436912.
diff --git a/src/messageview.c b/src/messageview.c
index 558ab6b..1e675b6 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1473,7 +1473,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
g_free(subject);
}
- if (msginfo && msginfo->folder) {
+ if (msginfo->folder) {
msginfo->folder->last_seen = msginfo->msgnum;
}
commit db088bee558c410b5ef4fecdd3359b33b46ab03a
Author: Paul <paul at claws-mail.org>
Date: Mon Jun 11 10:17:31 2018 +0100
two small fixes to text in label and tooltip
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 74740d2..742f5c2 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2798,7 +2798,7 @@ static void proxy_create_widget_func(PrefsPage * _page,
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- proxy_checkbtn = gtk_check_button_new_with_label (_("Use proxy server for this account"));
+ proxy_checkbtn = gtk_check_button_new_with_label (_("Use proxy server"));
PACK_FRAME (vbox1, proxy_frame, NULL);
gtk_frame_set_label_widget (GTK_FRAME(proxy_frame), proxy_checkbtn);
@@ -2809,7 +2809,7 @@ static void proxy_create_widget_func(PrefsPage * _page,
default_proxy_checkbtn =
gtk_check_button_new_with_label (C_("In account preferences, referring to whether or not use proxy settings from common preferences", "Use default settings"));
CLAWS_SET_TIP(default_proxy_checkbtn,
- _("Use proxy server settings from common preferences."));
+ _("Use global proxy server settings"));
gtk_box_pack_start (GTK_BOX (vbox2), default_proxy_checkbtn, FALSE, FALSE, 0);
vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
commit 779857e7e158504b443f92927deacdb883373f36
Author: Paul <paul at claws-mail.org>
Date: Mon Jun 11 10:16:54 2018 +0100
move 'Proxy' page from Other/ to Mail Handling/
diff --git a/src/prefs_proxy.c b/src/prefs_proxy.c
index c3cf43d..1d990f7 100644
--- a/src/prefs_proxy.c
+++ b/src/prefs_proxy.c
@@ -215,7 +215,7 @@ void prefs_proxy_init(void)
ProxyPage *page;
static gchar *path[3];
- path[0] = _("Other");
+ path[0] = _("Mail Handling");
path[1] = _("Proxy");
path[2] = NULL;
@@ -224,7 +224,7 @@ void prefs_proxy_init(void)
page->page.create_widget = prefs_proxy_create_widget;
page->page.destroy_widget = prefs_proxy_destroy_widget;
page->page.save_page = prefs_proxy_save;
- page->page.weight = 5.0;
+ page->page.weight = 190.0;
prefs_gtk_register_page((PrefsPage *)page);
prefs_proxy = page;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list