[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-208-gea396ce
ticho at claws-mail.org
ticho at claws-mail.org
Sat May 26 15:14:55 CEST 2018
The branch, gtk3 has been updated
via ea396ce934502170a544cc12c0289ae4599ea57e (commit)
via 5ef69f3066f6152a058fb8c84d67df8584ec9d83 (commit)
via 856244f896f0c2e3b242424cac74abee1365b336 (commit)
via 3d4be15e38344b893cc95816d408fc16d85ef213 (commit)
via 53710532cd14d746fcfc42956b8512e390cdb63d (commit)
via df53ae275f7ae14629198cc2a7e3881fcdf39be9 (commit)
via 546b18b9f52a90237ceed87efd971b0b19b642cf (commit)
via 2b22a38de42103e9434a050b0dedab4b7851af2e (commit)
via c2d317f1155fd5e74b4cf5b9108f3239756d3746 (commit)
via 2b5bf3d617f15cb25dc562fb1e2d895080fb6f3c (commit)
via 4bfea623b0e391cb1ebd709cc40466ec40db3f11 (commit)
via 6c2d65635e407490dd2199f22d349e076c57fdaf (commit)
via 41e94b1308998c18fd10e63a12ee4cf509f08e4a (commit)
via 6f872bed1eca27189bd864be39b190ae15f9b09d (commit)
via 2d39c20a00b8eda9c888fb12df78790caea7bd78 (commit)
via ca2819ebf75c4088ee6006d06e167257d15061c1 (commit)
via cecaac4cc8f186f74836872f4693e6af27b41608 (commit)
via 1332638639540280609610a0d2bee958431c57da (commit)
via 22cfb93341a7cc1bfe6f6c8b6889e3d86b4fe0bc (commit)
via 143961d1c747a895e98a5faace67bd554312f8be (commit)
via 6ca7f54aa3126cc0a9e3ad4b7479f1d290e4ea0b (commit)
from fe69add11e46a3f49cdf6aa27709c661d3db90f0 (commit)
Summary of changes:
AUTHORS | 3 +
configure.ac | 26 +-
doc/man/claws-mail.1 | 11 +-
po/fr.po | 1049 ++++++++++----------
src/Makefile.am | 1 +
src/addr_compl.c | 9 +-
src/addrcustomattr.c | 2 +-
src/addrduplicates.c | 7 +-
src/addressbook.c | 14 +-
src/common/passcrypt.c | 15 +-
src/common/plugin.c | 2 +-
src/common/socket.c | 2 +
src/common/template.c | 4 +-
src/common/template.h | 4 +-
src/common/utils.c | 32 +-
src/common/utils.h | 5 +-
src/compose.c | 24 +-
src/editaddress.c | 2 +-
src/edittags.c | 2 +-
src/exportldif.c | 4 +-
src/folder.h | 11 +-
src/folderview.c | 9 +-
src/gtk/about.c | 6 +-
src/gtk/authors.h | 3 +
src/gtk/combobox.c | 5 +-
src/gtk/foldersort.c | 9 +-
src/gtk/gtkcmclist.c | 2 +
src/gtk/gtkcmctree.c | 2 +
src/gtk/gtksctree.c | 2 +
src/gtk/gtkvscrollbutton.c | 2 +
src/gtk/quicksearch.c | 8 +-
src/imap.c | 6 +-
src/imap_gtk.c | 4 +-
src/jpilot.c | 2 +-
src/main.c | 18 +-
src/mainwindow.c | 3 +-
src/mbox.c | 4 +-
src/messageview.c | 9 +-
src/mimeview.c | 11 +-
src/partial_download.c | 6 +-
src/plugins/att_remover/att_remover.c | 2 +-
src/plugins/fancy/fancy_prefs.c | 2 +-
src/plugins/managesieve/sieve_editor.c | 10 +-
src/plugins/managesieve/sieve_prefs.c | 9 +-
.../notification/gtkhotkey/gtk-hotkey-info.c | 3 +-
.../gtkhotkey/gtk-hotkey-key-file-registry.c | 3 +-
.../notification/gtkhotkey/gtk-hotkey-listener.c | 3 +-
.../notification/gtkhotkey/gtk-hotkey-registry.c | 3 +-
.../gtkhotkey/gtk-hotkey-x11-listener.c | 3 +-
src/plugins/notification/notification_banner.c | 2 +-
src/plugins/notification/notification_trayicon.c | 8 +-
src/plugins/python/accounttype.c | 16 +-
src/plugins/python/composewindowtype.c | 15 +
src/plugins/python/folderpropertiestype.c | 16 +-
src/plugins/python/foldertype.c | 15 +
src/plugins/python/mailboxtype.c | 16 +-
src/plugins/python/messageinfotype.c | 15 +
src/plugins/python/python_plugin.c | 8 +-
src/plugins/vcalendar/common-views.c | 2 +-
src/plugins/vcalendar/vcal_dbus.c | 1 +
src/plugins/vcalendar/vcal_folder.c | 3 +-
src/plugins/vcalendar/vcal_manager.c | 5 +-
src/plugins/vcalendar/vcal_meeting_gtk.c | 3 +-
src/prefs_actions.c | 2 +-
src/prefs_common.h | 2 +-
src/prefs_filtering.c | 2 +-
src/prefs_folder_column.c | 146 +--
src/prefs_send.c | 2 +-
src/prefs_summary_column.c | 134 +--
src/prefs_template.c | 8 +-
src/prefs_template.h | 4 +-
src/prefs_toolbar.c | 11 +-
src/procmime.c | 6 +-
src/procmsg.c | 3 +-
src/textview.c | 11 +-
src/toolbar.c | 13 +-
src/uri_opener.c | 6 +-
77 files changed, 971 insertions(+), 882 deletions(-)
- Log -----------------------------------------------------------------
commit ea396ce934502170a544cc12c0289ae4599ea57e
Author: Paul <paul at claws-mail.org>
Date: Sat May 26 11:48:08 2018 +0100
fix gcc8 stringop-overflow warning
diff --git a/src/common/utils.h b/src/common/utils.h
index b3c088c..b37495e 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -140,7 +140,7 @@ guchar *g_base64_decode_wa(const gchar *text, gsize *out_len);
g_warning("can't allocate memory"); \
iffail; \
} else { \
- strncpy(__tmp, str, len); \
+ memcpy(__tmp, str, len); \
__tmp[len] = '\0'; \
} \
\
commit 5ef69f3066f6152a058fb8c84d67df8584ec9d83
Author: Paul <paul at claws-mail.org>
Date: Sat May 26 11:21:19 2018 +0100
fix bug #4023, 'Fix some small issues'
* src/common/plugin.c: Remove redundant 'const' qualifier
* src/jpilot.c: Remove redundant parentheses
* src/mbox.c: Likewise
* src/procmsg.c: Use fabs instead of abs for 'double' arg
* src/ textview.c: Declare 'shortcut' only if not GENERIC_UMPC
* src/toolbar.c: Declare 'toolbar_reply_menu_cb()' and
'toolbar_delete_dup_menu_cb' only if not GENERIC_UMPC
Patch by Avinash Sonawane
diff --git a/AUTHORS b/AUTHORS
index 9bbc156..22e1370 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -323,3 +323,4 @@ contributors (in addition to the above; based on Changelog)
Ralph Sennhauser
Michael Schwendt
Eric S. Raymond
+ Avinash Sonawane
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 5677214..64a6f01 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -80,7 +80,7 @@ const gchar *plugin_feature_names[] =
/* The plugin must be at least under one of these licences and have
the corresponding token returned by the plugin_licence function.
*/
-const gchar const *plugin_licence_tokens[] = {
+const gchar *plugin_licence_tokens[] = {
"LGPL2.1+", "LGPLv2.1+", "LGPL2.1", "LGPLv2.1",
"LGPL3+", "LGPLv3+", "LGPL3", "LGPLv3",
"GPL3+", "GPLv3+", "GPL3", "GPLv3",
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 360f514..2d4a706 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -283,6 +283,7 @@ static char *CONTRIBS_LIST[] = {
"Jesse Skinner",
"Ville Skyttä",
"Dale P. Smith",
+"Avinash Sonawane",
"Andrea Spadaccini",
"Bogdan Sumanariu",
"TAKANO",
diff --git a/src/jpilot.c b/src/jpilot.c
index cedfca9..fc3927c 100644
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -508,7 +508,7 @@ static int find_next_offset( mem_rec_header *mem_rh, long fpos,
/* *attrib = temp_mem_rh->attrib; */
/* *unique_id = temp_mem_rh->unique_id; */
}
- if ((temp_mem_rh->offset == fpos)) {
+ if (temp_mem_rh->offset == fpos) {
found = 1;
*attrib = temp_mem_rh->attrib;
*unique_id = temp_mem_rh->unique_id;
diff --git a/src/mbox.c b/src/mbox.c
index e2c51cc..9929a29 100644
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -174,7 +174,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
/* From separator or quoted From */
offset = 0;
/* detect leading '>' char(s) */
- while ((buf[offset] == '>')) {
+ while (buf[offset] == '>') {
offset++;
}
if (!strncmp(buf+offset, "From ", 5)) {
@@ -605,7 +605,7 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
offset = 0;
/* detect leading '>' char(s) */
- while ((buf[offset] == '>')) {
+ while (buf[offset] == '>') {
offset++;
}
if (!strncmp(buf+offset, "From ", 5)) {
diff --git a/src/procmsg.c b/src/procmsg.c
index 3e989dd..e484700 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
+#include <math.h>
#include "main.h"
#include "utils.h"
@@ -182,7 +183,7 @@ static GNode *subject_hashtable_lookup(GHashTable *hashtable, MsgInfo *msginfo)
/* parent node must not be more then thread_by_subject_max_age
days older then msginfo */
- if (abs(difftime(msginfo->date_t, hashtable_msginfo->date_t)) >
+ if (fabs(difftime(msginfo->date_t, hashtable_msginfo->date_t)) >
prefs_common.thread_by_subject_max_age * 3600 * 24)
match = FALSE;
diff --git a/src/textview.c b/src/textview.c
index 5ce0bac..0751e01 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -951,8 +951,11 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
GtkTextBuffer *buffer;
GtkTextIter iter;
const gchar *name;
- gchar *content_type, *shortcut;
+ gchar *content_type;
GtkUIManager *ui_manager;
+#ifndef GENERIC_UMPC
+ gchar *shortcut;
+#endif
if (!partinfo) return;
diff --git a/src/toolbar.c b/src/toolbar.c
index 6212927..823a894 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -2203,6 +2203,7 @@ static void toolbar_buttons_cb(GtkWidget *widget,
gtk_widget_show(item); \
}
+#ifndef GENERIC_UMPC
static void toolbar_reply_menu_cb(GtkWidget *widget, gpointer data)
{
gpointer int_value = g_object_get_data(G_OBJECT(widget), "int-value");
@@ -2211,22 +2212,24 @@ static void toolbar_reply_menu_cb(GtkWidget *widget, gpointer data)
toolbar_reply(toolbar_item, GPOINTER_TO_INT(int_value));
}
-static void toolbar_learn_menu_cb(GtkWidget *widget, gpointer data)
+static void toolbar_delete_dup_menu_cb(GtkWidget *widget, gpointer data)
{
gpointer int_value = g_object_get_data(G_OBJECT(widget), "int-value");
ToolbarItem *toolbar_item = (ToolbarItem *)data;
- toolbar_learn(toolbar_item, GPOINTER_TO_INT(int_value));
+ toolbar_delete_dup(toolbar_item, GPOINTER_TO_INT(int_value));
}
+#endif
-static void toolbar_delete_dup_menu_cb(GtkWidget *widget, gpointer data)
+static void toolbar_learn_menu_cb(GtkWidget *widget, gpointer data)
{
gpointer int_value = g_object_get_data(G_OBJECT(widget), "int-value");
ToolbarItem *toolbar_item = (ToolbarItem *)data;
-
- toolbar_delete_dup(toolbar_item, GPOINTER_TO_INT(int_value));
+
+ toolbar_learn(toolbar_item, GPOINTER_TO_INT(int_value));
}
+
/**
* Create a new toolbar with specified type
* if a callback list is passed it will be used before the
commit 856244f896f0c2e3b242424cac74abee1365b336
Author: wwp <wwp at free.fr>
Date: Fri May 25 19:01:50 2018 +0200
Updates to the French translation.
diff --git a/po/fr.po b/po/fr.po
index 8152b93..cb8d5c4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Claws Mail 3.10.0\n"
"Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2018-05-05 23:58+0200\n"
-"PO-Revision-Date: 2018-05-06 15:42+0100\n"
+"POT-Creation-Date: 2018-05-25 18:50+0200\n"
+"PO-Revision-Date: 2018-05-25 19:01+0100\n"
"Last-Translator: Tristan Chabredier (wwp) <subscript at free.fr>\n"
"Language-Team: Claws Mail translators <translators at lists.claws-mail.org>\n"
"Language: fr\n"
@@ -161,10 +161,10 @@ msgstr ""
#: src/action.c:988 src/compose.c:5222 src/compose.c:5227 src/ldaputil.c:333
#: src/plugins/bogofilter/bogofilter.c:857
#: src/plugins/tnef_parse/tnef_parse.c:75
-#: src/plugins/vcalendar/vcal_folder.c:1823
-#: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1840
-#: src/plugins/vcalendar/vcal_folder.c:1843 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1822
+#: src/plugins/vcalendar/vcal_folder.c:1826
+#: src/plugins/vcalendar/vcal_folder.c:1839
+#: src/plugins/vcalendar/vcal_folder.c:1842 src/privacy.c:62
msgid "Unknown error"
msgstr "Erreur inconnue"
@@ -378,19 +378,19 @@ msgstr "Adresse"
msgid "Address book path"
msgstr "Chemin dans le carnet"
-#: src/addrduplicates.c:793 src/addressbook.c:1442 src/addressbook.c:1495
+#: src/addrduplicates.c:790 src/addressbook.c:1442 src/addressbook.c:1495
msgid "Delete address(es)"
msgstr "Suppression d'adresse(s)"
-#: src/addrduplicates.c:794 src/addressbook.c:1496
+#: src/addrduplicates.c:791 src/addressbook.c:1496
msgid "Really delete the address(es)?"
msgstr "Voulez-vous vraiment supprimer la(les) adresse(s) sélectionnée(s) ?"
-#: src/addrduplicates.c:843
+#: src/addrduplicates.c:840
msgid "Delete address"
msgstr "Supprimer l'adresse"
-#: src/addrduplicates.c:844 src/addressbook.c:1443
+#: src/addrduplicates.c:841 src/addressbook.c:1443
msgid "This address data is readonly and cannot be deleted."
msgstr ""
"Les données de cette adresse sont en lecture seule \n"
@@ -962,14 +962,14 @@ msgstr ""
"La mise à jour a échoué. Les modifications ne seront pas appliquées au "
"répertoire."
-#: src/alertpanel.c:144 src/compose.c:9740
+#: src/alertpanel.c:144 src/compose.c:9737
msgid "Notice"
msgstr "Information"
#: src/alertpanel.c:157 src/compose.c:5813 src/compose.c:6341
-#: src/compose.c:12186 src/file_checker.c:78 src/file_checker.c:101
+#: src/compose.c:12180 src/file_checker.c:78 src/file_checker.c:101
#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:806
-#: src/plugins/vcalendar/vcalendar.c:124 src/summaryview.c:5019
+#: src/plugins/vcalendar/vcalendar.c:124 src/summaryview.c:5015
msgid "Warning"
msgstr "Alerte"
@@ -1129,30 +1129,30 @@ msgstr "Ce message est trop volumineux (la taille maximale étant de %s)\n"
msgid "couldn't start STARTTLS session\n"
msgstr "Impossible d'initier une session STARTTLS\n"
-#: src/common/socket.c:571
+#: src/common/socket.c:573
msgid "Socket IO timeout.\n"
msgstr "Dépassement du délai d'attente lors d'entrées/sorties socket.\n"
-#: src/common/socket.c:600
+#: src/common/socket.c:602
msgid "Connection timed out.\n"
msgstr "Dépassement du délai d'établissement de la connexion.\n"
-#: src/common/socket.c:734
+#: src/common/socket.c:736
#, c-format
msgid "%s:%d: connection failed (%s).\n"
msgstr "%s:%d : la connexion a échoué (%s).\n"
-#: src/common/socket.c:974
+#: src/common/socket.c:976
#, c-format
msgid "%s:%d: unknown host.\n"
msgstr "%s:%d : hôte inconnu.\n"
-#: src/common/socket.c:1066
+#: src/common/socket.c:1068
#, c-format
msgid "%s:%s: host lookup failed (%s).\n"
msgstr "%s:%s : échec de la recherche de l'hôte (%s).\n"
-#: src/common/socket.c:1370
+#: src/common/socket.c:1372
#, c-format
msgid "write on fd%d: %s\n"
msgstr "écriture sur fd%d : %s\n"
@@ -1242,232 +1242,232 @@ msgstr "<non spécifié dans le certificat>"
msgid "(Subject cleared by RegExp)"
msgstr "(Sujet supprimé par RegExp)"
-#: src/common/utils.c:256
+#: src/common/utils.c:238
#, c-format
msgid "%dB"
msgstr "%do"
-#: src/common/utils.c:257
+#: src/common/utils.c:239
#, c-format
msgid "%d.%02dKB"
msgstr "%d.%02dko"
-#: src/common/utils.c:258
+#: src/common/utils.c:240
#, c-format
msgid "%d.%02dMB"
msgstr "%d.%02dMo"
-#: src/common/utils.c:259
+#: src/common/utils.c:241
#, c-format
msgid "%.2fGB"
msgstr "%.2fGo"
-#: src/common/utils.c:4781
+#: src/common/utils.c:4767
msgctxt "Complete day name for use by strftime"
msgid "Sunday"
msgstr "Dimanche"
-#: src/common/utils.c:4782
+#: src/common/utils.c:4768
msgctxt "Complete day name for use by strftime"
msgid "Monday"
msgstr "Lundi"
-#: src/common/utils.c:4783
+#: src/common/utils.c:4769
msgctxt "Complete day name for use by strftime"
msgid "Tuesday"
msgstr "Mardi"
-#: src/common/utils.c:4784
+#: src/common/utils.c:4770
msgctxt "Complete day name for use by strftime"
msgid "Wednesday"
msgstr "Mercredi"
-#: src/common/utils.c:4785
+#: src/common/utils.c:4771
msgctxt "Complete day name for use by strftime"
msgid "Thursday"
msgstr "Jeudi"
-#: src/common/utils.c:4786
+#: src/common/utils.c:4772
msgctxt "Complete day name for use by strftime"
msgid "Friday"
msgstr "Vendredi"
-#: src/common/utils.c:4787
+#: src/common/utils.c:4773
msgctxt "Complete day name for use by strftime"
msgid "Saturday"
msgstr "Samedi"
-#: src/common/utils.c:4789
+#: src/common/utils.c:4775
msgctxt "Complete month name for use by strftime"
msgid "January"
msgstr "Janvier"
-#: src/common/utils.c:4790
+#: src/common/utils.c:4776
msgctxt "Complete month name for use by strftime"
msgid "February"
msgstr "Février"
-#: src/common/utils.c:4791
+#: src/common/utils.c:4777
msgctxt "Complete month name for use by strftime"
msgid "March"
msgstr "Mars"
-#: src/common/utils.c:4792
+#: src/common/utils.c:4778
msgctxt "Complete month name for use by strftime"
msgid "April"
msgstr "Avril"
-#: src/common/utils.c:4793
+#: src/common/utils.c:4779
msgctxt "Complete month name for use by strftime"
msgid "May"
msgstr "Mai"
-#: src/common/utils.c:4794
+#: src/common/utils.c:4780
msgctxt "Complete month name for use by strftime"
msgid "June"
msgstr "Juin"
-#: src/common/utils.c:4795
+#: src/common/utils.c:4781
msgctxt "Complete month name for use by strftime"
msgid "July"
msgstr "Juillet"
-#: src/common/utils.c:4796
+#: src/common/utils.c:4782
msgctxt "Complete month name for use by strftime"
msgid "August"
msgstr "Août"
-#: src/common/utils.c:4797
+#: src/common/utils.c:4783
msgctxt "Complete month name for use by strftime"
msgid "September"
msgstr "Septembre"
-#: src/common/utils.c:4798
+#: src/common/utils.c:4784
msgctxt "Complete month name for use by strftime"
msgid "October"
msgstr "Octobre"
-#: src/common/utils.c:4799
+#: src/common/utils.c:4785
msgctxt "Complete month name for use by strftime"
msgid "November"
msgstr "Novembre"
-#: src/common/utils.c:4800
+#: src/common/utils.c:4786
msgctxt "Complete month name for use by strftime"
msgid "December"
msgstr "Décembre"
-#: src/common/utils.c:4802
+#: src/common/utils.c:4788
msgctxt "Abbr. day name for use by strftime"
msgid "Sun"
msgstr "Dim"
-#: src/common/utils.c:4803
+#: src/common/utils.c:4789
msgctxt "Abbr. day name for use by strftime"
msgid "Mon"
msgstr "Lun"
-#: src/common/utils.c:4804
+#: src/common/utils.c:4790
msgctxt "Abbr. day name for use by strftime"
msgid "Tue"
msgstr "Mar"
-#: src/common/utils.c:4805
+#: src/common/utils.c:4791
msgctxt "Abbr. day name for use by strftime"
msgid "Wed"
msgstr "Mer"
-#: src/common/utils.c:4806
+#: src/common/utils.c:4792
msgctxt "Abbr. day name for use by strftime"
msgid "Thu"
msgstr "Jeu"
-#: src/common/utils.c:4807
+#: src/common/utils.c:4793
msgctxt "Abbr. day name for use by strftime"
msgid "Fri"
msgstr "Ven"
-#: src/common/utils.c:4808
+#: src/common/utils.c:4794
msgctxt "Abbr. day name for use by strftime"
msgid "Sat"
msgstr "Sam"
-#: src/common/utils.c:4810
+#: src/common/utils.c:4796
msgctxt "Abbr. month name for use by strftime"
msgid "Jan"
msgstr "Jan"
-#: src/common/utils.c:4811
+#: src/common/utils.c:4797
msgctxt "Abbr. month name for use by strftime"
msgid "Feb"
msgstr "Fév"
-#: src/common/utils.c:4812
+#: src/common/utils.c:4798
msgctxt "Abbr. month name for use by strftime"
msgid "Mar"
msgstr "Mar"
-#: src/common/utils.c:4813
+#: src/common/utils.c:4799
msgctxt "Abbr. month name for use by strftime"
msgid "Apr"
msgstr "Avr"
-#: src/common/utils.c:4814
+#: src/common/utils.c:4800
msgctxt "Abbr. month name for use by strftime"
msgid "May"
msgstr "Mai"
-#: src/common/utils.c:4815
+#: src/common/utils.c:4801
msgctxt "Abbr. month name for use by strftime"
msgid "Jun"
msgstr "Jun"
-#: src/common/utils.c:4816
+#: src/common/utils.c:4802
msgctxt "Abbr. month name for use by strftime"
msgid "Jul"
msgstr "Jui"
-#: src/common/utils.c:4817
+#: src/common/utils.c:4803
msgctxt "Abbr. month name for use by strftime"
msgid "Aug"
msgstr "Aoû"
-#: src/common/utils.c:4818
+#: src/common/utils.c:4804
msgctxt "Abbr. month name for use by strftime"
msgid "Sep"
msgstr "Sep"
-#: src/common/utils.c:4819
+#: src/common/utils.c:4805
msgctxt "Abbr. month name for use by strftime"
msgid "Oct"
msgstr "Oct"
-#: src/common/utils.c:4820
+#: src/common/utils.c:4806
msgctxt "Abbr. month name for use by strftime"
msgid "Nov"
msgstr "Nov"
-#: src/common/utils.c:4821
+#: src/common/utils.c:4807
msgctxt "Abbr. month name for use by strftime"
msgid "Dec"
msgstr "Déc"
-#: src/common/utils.c:4832
+#: src/common/utils.c:4818
msgctxt "For use by strftime (morning)"
msgid "AM"
msgstr "AM"
-#: src/common/utils.c:4833
+#: src/common/utils.c:4819
msgctxt "For use by strftime (afternoon)"
msgid "PM"
msgstr "PM"
-#: src/common/utils.c:4834
+#: src/common/utils.c:4820
msgctxt "For use by strftime (morning, lowercase)"
msgid "am"
msgstr "am"
-#: src/common/utils.c:4835
+#: src/common/utils.c:4821
msgctxt "For use by strftime (afternoon, lowercase)"
msgid "pm"
msgstr "pm"
@@ -1922,7 +1922,7 @@ msgstr ""
msgid "Are you sure?"
msgstr "Êtes-vous sûr ?"
-#: src/compose.c:3646 src/compose.c:10784 src/compose.c:11662
+#: src/compose.c:3646 src/compose.c:10781 src/compose.c:11659
msgid "_Insert"
msgstr "_Insérer"
@@ -2051,7 +2051,7 @@ msgid ""
msgstr ""
"Impossible de mettre le message en file d'attente d'envoi :\n"
"\n"
-"La signature a échoué : %s"
+"Sa signature a échoué : %s"
#: src/compose.c:5225
#, c-format
@@ -2178,7 +2178,7 @@ msgid "Mime type"
msgstr "Type Mime"
#: src/compose.c:7407 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:464
-#: src/prefs_matcher.c:629 src/prefs_summaries.c:439
+#: src/prefs_matcher.c:629 src/prefs_summaries.c:441
#: src/prefs_summary_column.c:84 src/summaryview.c:449
msgid "Size"
msgstr "Taille"
@@ -2263,35 +2263,35 @@ msgctxt "'%s' stands for a header name"
msgid "Template '%s' format error."
msgstr "Erreur de formatage dans l'en-tête « %s » du modèle."
-#: src/compose.c:9318
+#: src/compose.c:9315
msgid "Invalid MIME type."
msgstr "Type MIME invalide."
-#: src/compose.c:9333
+#: src/compose.c:9330
msgid "File doesn't exist or is empty."
msgstr "Le fichier n'existe pas ou est vide."
-#: src/compose.c:9407
+#: src/compose.c:9404
msgid "Properties"
msgstr "Propriétés"
-#: src/compose.c:9424
+#: src/compose.c:9421
msgid "MIME type"
msgstr "Type MIME"
-#: src/compose.c:9457
+#: src/compose.c:9454
msgid "Encoding"
msgstr "Encodage"
-#: src/compose.c:9477
+#: src/compose.c:9474
msgid "Path"
msgstr "Chemin d'accès"
-#: src/compose.c:9478
+#: src/compose.c:9475
msgid "File name"
msgstr "Nom du fichier"
-#: src/compose.c:9737
+#: src/compose.c:9734
#, c-format
msgid ""
"The external editor is still working.\n"
@@ -2302,19 +2302,19 @@ msgstr ""
"Voulez-vous forcer sa fermeture ?\n"
"Identifiant du groupe de processus : %d"
-#: src/compose.c:10205 src/messageview.c:1105
+#: src/compose.c:10202 src/messageview.c:1105
msgid "Claws Mail needs network access in order to send this email."
msgstr "Claws Mail nécessite un accès réseau pour envoyer ce message."
-#: src/compose.c:10398
+#: src/compose.c:10395
msgid "Could not save draft."
msgstr "Impossible d'enregistrer le brouillon."
-#: src/compose.c:10402
+#: src/compose.c:10399
msgid "Could not save draft"
msgstr "Enregistrement impossible du brouillon"
-#: src/compose.c:10403
+#: src/compose.c:10400
msgid ""
"Could not save draft.\n"
"Do you want to cancel exit or discard this email?"
@@ -2323,24 +2323,24 @@ msgstr ""
"Voulez-vous annuler la fermeture de l'application ou simplement interrompre "
"l'édition de ce message ?"
-#: src/compose.c:10405
+#: src/compose.c:10402
msgid "_Cancel exit"
msgstr "A_nnuler"
-#: src/compose.c:10405
+#: src/compose.c:10402
msgid "_Discard email"
msgstr "_Interrompre"
-#: src/compose.c:10594 src/compose.c:10608
+#: src/compose.c:10591 src/compose.c:10605
msgid "Select file"
msgstr "Sélectionner un fichier"
-#: src/compose.c:10622
+#: src/compose.c:10619
#, c-format
msgid "File '%s' could not be read."
msgstr "Échec lors de la lecture de « %s »."
-#: src/compose.c:10624
+#: src/compose.c:10621
#, c-format
msgid ""
"File '%s' contained invalid characters\n"
@@ -2349,54 +2349,54 @@ msgstr ""
"Le fichier « %s » contient des caractères n'appartenant pas\n"
"à l'encodage courant : l'insertion peut être incorrecte."
-#: src/compose.c:10703
+#: src/compose.c:10700
msgid "Discard message"
msgstr "Interruption de la composition du message"
-#: src/compose.c:10704
+#: src/compose.c:10701
msgid "This message has been modified. Discard it?"
msgstr ""
"Ce message a été modifié mais non envoyé. Voulez-vous interrompre sa "
"composition ?"
-#: src/compose.c:10705 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10702 src/plugins/managesieve/sieve_editor.c:434
msgid "_Discard"
msgstr "_Interrompre"
-#: src/compose.c:10705 src/compose.c:10710
+#: src/compose.c:10702 src/compose.c:10707
msgid "_Save to Drafts"
msgstr "Enregi_strer un brouillon"
-#: src/compose.c:10708 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10705 src/plugins/managesieve/sieve_editor.c:432
msgid "Save changes"
msgstr "Enregistrer les modifications"
-#: src/compose.c:10709
+#: src/compose.c:10706
msgid "This message has been modified. Save the latest changes?"
msgstr ""
"Ce message a été modifié. Voulez-vous enregistrer les dernières "
"modifications ?"
-#: src/compose.c:10710
+#: src/compose.c:10707
msgid "_Don't save"
msgstr "_Ne pas enregistrer"
-#: src/compose.c:10781
+#: src/compose.c:10778
#, c-format
msgid "Do you want to apply the template '%s'?"
msgstr "Voulez-vous utiliser le modèle « %s » ?"
-#: src/compose.c:10783
+#: src/compose.c:10780
msgid "Apply template"
msgstr "Utiliser le modèle"
-#: src/compose.c:10784 src/prefs_actions.c:329 src/prefs_filtering_action.c:594
+#: src/compose.c:10781 src/prefs_actions.c:329 src/prefs_filtering_action.c:594
#: src/prefs_filtering.c:477 src/prefs_matcher.c:769 src/prefs_template.c:310
-#: src/prefs_toolbar.c:1017
+#: src/prefs_toolbar.c:1018
msgid "_Replace"
msgstr "_Remplacer"
-#: src/compose.c:11655
+#: src/compose.c:11652
#, c-format
msgid ""
"Do you want to insert the contents of the file into the message body, or "
@@ -2411,20 +2411,20 @@ msgstr[1] ""
"Voulez-vous insérer le contenu des %d fichiers directement dans le corps du "
"message ou les adjoindre en tant que pièces jointes ?"
-#: src/compose.c:11661
+#: src/compose.c:11658
msgid "Insert or attach?"
msgstr "Insérer ou adjoindre ?"
-#: src/compose.c:11662
+#: src/compose.c:11659
msgid "_Attach"
msgstr "_Adjoindre"
-#: src/compose.c:11883
+#: src/compose.c:11877
#, c-format
msgid "Quote format error at line %d."
msgstr "Erreur de formatage de la citation à la ligne %d."
-#: src/compose.c:12180
+#: src/compose.c:12174
#, c-format
msgid ""
"You are about to reply to %d messages. Opening the windows could take some "
@@ -2990,7 +2990,7 @@ msgid "Add New LDAP Server"
msgstr "Configuration d'un nouveau serveur LDAP"
#: src/edittags.c:192 src/prefs_filtering_action.c:1426
-#: src/prefs_summaries.c:446
+#: src/prefs_summaries.c:448
msgid "Tag"
msgstr "Label"
@@ -3124,7 +3124,7 @@ msgstr "Feuille de style"
#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:125 src/mainwindow.c:1170
#: src/plugins/archive/archiver_prefs.c:313
#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:949
-#: src/prefs_toolbar.c:768 src/prefs_toolbar.c:1434 src/summaryview.c:6144
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6188
msgid "None"
msgstr "Aucun"
@@ -3364,7 +3364,7 @@ msgstr "Exporter le carnet d'adresses vers un ficher LDIF"
msgid "Distinguished Name"
msgstr "Nom absolu (DN)"
-#: src/export.c:113 src/summaryview.c:8316
+#: src/export.c:113 src/summaryview.c:8360
msgid "Export to mbox file"
msgstr "Exporter la sélection en fichier mbox"
@@ -3695,7 +3695,7 @@ msgstr "NouveauDossier"
#: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2059
+#: src/plugins/vcalendar/vcal_folder.c:2058
#, c-format
msgid "'%c' can't be included in folder name."
msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
@@ -3703,7 +3703,7 @@ msgstr "'%c' n'est pas un caractère valide dans le nom d'un dossier."
#: src/foldersel.c:595 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2066
+#: src/plugins/vcalendar/vcal_folder.c:2065
#, c-format
msgid "The folder '%s' already exists."
msgstr "Le dossier '%s' existe déjà."
@@ -3753,13 +3753,13 @@ msgstr "_Envoyer les messages.."
#: src/folderview.c:396 src/folderview.c:443
#: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:392 src/summaryview.c:6418
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:392 src/summaryview.c:6462
msgid "New"
msgstr "Nouveau"
#: src/folderview.c:397 src/folderview.c:444
#: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6420
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:391 src/summaryview.c:6464
#: src/toolbar.c:512
msgid "Unread"
msgstr "Non lu"
@@ -3778,7 +3778,7 @@ msgstr "#"
msgid "Setting folder info..."
msgstr "Initialisation des données des dossiers.."
-#: src/folderview.c:866 src/summaryview.c:4228
+#: src/folderview.c:866 src/summaryview.c:4226
msgid "Mark all as read"
msgstr "Marquer tous comme lus"
@@ -3790,12 +3790,12 @@ msgstr ""
"Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
"dossiers comme lus ?"
-#: src/folderview.c:869 src/summaryview.c:4229
+#: src/folderview.c:869 src/summaryview.c:4227
msgid "Do you really want to mark all mails in this folder as read?"
msgstr ""
"Voulez-vous vraiment marquer tous les messages de ce dossier comme lus ?"
-#: src/folderview.c:872 src/summaryview.c:4276
+#: src/folderview.c:872 src/summaryview.c:4272
msgid "Mark all as unread"
msgstr "Marquer tous comme non l_us"
@@ -3807,7 +3807,7 @@ msgstr ""
"Voulez-vous vraiment marquer tous les messages de ce dossier et de ses sous-"
"dossiers comme non lus ?"
-#: src/folderview.c:875 src/summaryview.c:4277
+#: src/folderview.c:875 src/summaryview.c:4273
msgid "Do you really want to mark all mails in this folder as unread?"
msgstr ""
"Voulez-vous vraiment marquer tous les messages de ce dossier comme non lus ?"
@@ -3817,7 +3817,7 @@ msgstr ""
msgid "Scanning folder %s/%s..."
msgstr "Analyse du dossier %s/%s.."
-#: src/folderview.c:1068 src/imap.c:4618 src/mainwindow.c:5236 src/setup.c:96
+#: src/folderview.c:1068 src/imap.c:4618 src/mainwindow.c:5237 src/setup.c:96
#, c-format
msgid "Scanning folder %s..."
msgstr "Analyse du dossier %s.."
@@ -3864,7 +3864,7 @@ msgstr "Ouverture du dossier %s.."
msgid "Folder could not be opened."
msgstr "Le dossier n'a pu être ouvert."
-#: src/folderview.c:2483 src/mainwindow.c:2879 src/mainwindow.c:2884
+#: src/folderview.c:2483 src/mainwindow.c:2880 src/mainwindow.c:2885
msgid "Empty trash"
msgstr "Vider la corbeille"
@@ -3898,7 +3898,7 @@ msgstr "Voulez-vous envoyer l'ensemble des messages en file d'attente ?"
msgid "Some errors occurred while sending queued messages."
msgstr "Une erreur est survenue pendant l'envoi de messages en attente."
-#: src/folderview.c:2554 src/main.c:2798 src/toolbar.c:3051
+#: src/folderview.c:2554 src/main.c:2787 src/toolbar.c:3051
#, c-format
msgid ""
"Some errors occurred while sending queued messages:\n"
@@ -3967,7 +3967,7 @@ msgstr "Le déplacement a échoué."
msgid "Processing configuration for folder %s"
msgstr "Options de filtrage/traitement du dossier %s"
-#: src/folderview.c:3177 src/summaryview.c:4685 src/summaryview.c:4791
+#: src/folderview.c:3176 src/summaryview.c:4681 src/summaryview.c:4787
msgid "The destination folder can only be used to store subfolders."
msgstr ""
"Le dossier de destination ne peut être utilisé seulement pour stocker des "
@@ -4058,11 +4058,11 @@ msgstr ""
#: src/gtk/about.c:162 src/gtk/about.c:850
msgid ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2018\n"
"The Claws Mail Team\n"
"and Hiroyuki Yamamoto"
msgstr ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2018\n"
"L'équipe Claws Mail\n"
"et Hiroyuki Yamamoto"
@@ -4218,44 +4218,44 @@ msgstr ""
"Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU "
"avec ce programme. Si ça n'était pas le cas, veuillez consulter "
-#: src/gtk/about.c:717 src/main.c:2622
+#: src/gtk/about.c:717 src/main.c:2611
msgid "Session statistics\n"
msgstr "Statistiques de la session\n"
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2632 src/main.c:2635
+#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2621 src/main.c:2624
#, c-format
msgid "Started: %s\n"
msgstr "Démarrée le : %s\n"
-#: src/gtk/about.c:737 src/main.c:2641
+#: src/gtk/about.c:737 src/main.c:2630
msgid "Incoming traffic\n"
msgstr "Trafic entrant\n"
-#: src/gtk/about.c:740 src/main.c:2644
+#: src/gtk/about.c:740 src/main.c:2633
#, c-format
msgid "Received messages: %d\n"
msgstr "Messages reçus : %d\n"
-#: src/gtk/about.c:747 src/main.c:2650
+#: src/gtk/about.c:747 src/main.c:2639
msgid "Outgoing traffic\n"
msgstr "Trafic sortant\n"
-#: src/gtk/about.c:750 src/main.c:2653
+#: src/gtk/about.c:750 src/main.c:2642
#, c-format
msgid "New/redirected messages: %d\n"
msgstr "Nouveaux messages et redirections : %d\n"
-#: src/gtk/about.c:755 src/main.c:2657
+#: src/gtk/about.c:755 src/main.c:2646
#, c-format
msgid "Replied messages: %d\n"
msgstr "Réponses : %d\n"
-#: src/gtk/about.c:760 src/main.c:2661
+#: src/gtk/about.c:760 src/main.c:2650
#, c-format
msgid "Forwarded messages: %d\n"
msgstr "Messages transférés : %d\n"
-#: src/gtk/about.c:765 src/main.c:2665
+#: src/gtk/about.c:765 src/main.c:2654
#, c-format
msgid "Total outgoing messages: %d\n"
msgstr "Total des messages sortants : %d\n"
@@ -4348,17 +4348,17 @@ msgstr "Vert clair"
msgid "Magenta"
msgstr "Magenta"
-#: src/gtk/foldersort.c:238
+#: src/gtk/foldersort.c:241
msgid "Set mailbox order"
msgstr "Définir l'ordre de tri des boîtes aux lettres"
-#: src/gtk/foldersort.c:272
+#: src/gtk/foldersort.c:275
msgid "Move mailboxes up or down to change the sort order in the Folder list."
msgstr ""
"Monter ou descendre les boîtes aux lettres dans la liste pour changer "
"l'ordre de tri dans la liste des dossiers."
-#: src/gtk/foldersort.c:306
+#: src/gtk/foldersort.c:309
msgid "Mailboxes"
msgstr "Boîtes aux lettres"
@@ -4485,7 +4485,7 @@ msgid "Configuring..."
msgstr "Configuration.."
#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1242
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:440
+#: src/prefs_matcher.c:2164 src/prefs_summaries.c:442
#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:448
msgid "Date"
msgstr "Date"
@@ -4495,7 +4495,7 @@ msgid "Date:"
msgstr "Date:"
#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1239
-#: src/prefs_matcher.c:2161 src/prefs_summaries.c:442
+#: src/prefs_matcher.c:2161 src/prefs_summaries.c:444
#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:446
msgid "From"
msgstr "De"
@@ -4517,7 +4517,7 @@ msgid "Reply-To"
msgstr "Répondre-à"
#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1240
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:443
+#: src/prefs_matcher.c:2162 src/prefs_summaries.c:445
#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:447
msgid "To"
msgstr "À"
@@ -4554,7 +4554,7 @@ msgid "References:"
msgstr "Références:"
#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1238
-#: src/prefs_matcher.c:2160 src/prefs_summaries.c:444
+#: src/prefs_matcher.c:2160 src/prefs_summaries.c:446
#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:445
msgid "Subject"
msgstr "Sujet"
@@ -4678,7 +4678,7 @@ msgid "Seen:"
msgstr "Consulté:"
#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:448
+#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/summaryview.c:2853
msgid "Status"
msgstr "État"
@@ -5088,7 +5088,7 @@ msgstr ""
#: src/plugins/rssyl/rssyl_prefs.c:70
#: src/plugins/spam_report/spam_report_prefs.c:82
#: src/plugins/spamassassin/spamassassin_gtk.c:670
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:923
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
msgid "Plugins"
msgstr "Modules"
@@ -5100,7 +5100,7 @@ msgstr "_Charger.."
msgid "_Unload"
msgstr "_Enlever"
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:229
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:230
msgid "Description"
msgstr "Description"
@@ -5566,7 +5566,7 @@ msgstr "(Pas de sujet)"
msgid "Error:"
msgstr "Erreur : "
-#: src/image_viewer.c:299 src/mimeview.c:2610
+#: src/image_viewer.c:299 src/mimeview.c:2613
#: src/plugins/att_remover/att_remover.c:306
#: src/plugins/pdf_viewer/poppler_viewer.c:700
msgid "Filename:"
@@ -6088,20 +6088,20 @@ msgstr "Hériter des options du dossier parent"
#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/vcalendar/vcal_folder.c:2050
#, c-format
msgid "Input new name for '%s':"
msgstr "Saisir le nouveau nom pour '%s' :"
#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2052
+#: src/plugins/vcalendar/vcal_folder.c:2051
msgid "Rename folder"
msgstr "Changement de nom de dossier"
#: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2072
+#: src/plugins/vcalendar/vcal_folder.c:2071
msgid ""
"The folder could not be renamed.\n"
"The new folder name is not allowed."
@@ -6134,7 +6134,7 @@ msgstr ""
#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2005
+#: src/plugins/vcalendar/vcal_folder.c:2004
#, c-format
msgid "Can't remove the folder '%s'."
msgstr "Impossible de supprimer le dossier '%s'."
@@ -6444,8 +6444,8 @@ msgstr "La connexion a échoué"
msgid "Auth failed"
msgstr "L'authentification a échoué"
-#: src/inc.c:657 src/prefs_matcher.c:397 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:87 src/summaryview.c:2849 src/summaryview.c:6444
+#: src/inc.c:657 src/prefs_matcher.c:397 src/prefs_summaries.c:453
+#: src/prefs_summary_column.c:87 src/summaryview.c:2849 src/summaryview.c:6488
msgid "Locked"
msgstr "Verrouillé"
@@ -6634,13 +6634,13 @@ msgstr "_Seulement pour cette fois-ci"
#: src/ldapupdate.c:680
#, c-format
msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
-msgstr "LDAP erreur (recherche): pour l'attribut '%s': %d (%s)\n"
+msgstr "LDAP erreur (recherche) : pour l'attribut '%s' : %d (%s)\n"
#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
#: src/ldapupdate.c:1330
#, c-format
msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
-msgstr "LDAP erreur (modification): pour le DN '%s': %d (%s)\n"
+msgstr "LDAP erreur (modification) : pour le DN '%s' : %d (%s)\n"
#: src/ldapupdate.c:1046
msgid "Some SN"
@@ -6649,22 +6649,22 @@ msgstr "Un SN"
#: src/ldapupdate.c:1133
#, c-format
msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
-msgstr "LDAP erreur (renommage): de '%s' vers '%s': %d (%s)\n"
+msgstr "LDAP erreur (renommage) : de '%s' vers '%s' : %d (%s)\n"
#: src/ldaputil.c:81 src/ldaputil.c:156
msgid "LDAP (search): succesful\n"
-msgstr "LDAP (recherche): succès\n"
+msgstr "LDAP (recherche) : succès\n"
#: src/ldaputil.c:112 src/ldaputil.c:200
#, c-format
msgid "LDAP error (search): %d (%s)\n"
-msgstr "LDAP (recherche): %d (%s)\n"
+msgstr "LDAP erreur (recherche) : %d (%s)\n"
#: src/ldif.c:758
msgid "Nick Name"
msgstr "Surnom"
-#: src/main.c:249
+#: src/main.c:246
#, c-format
msgid ""
"File '%s' already exists.\n"
@@ -6673,7 +6673,7 @@ msgstr ""
"Le fichier '%s' existe déjà.\n"
"Impossible de créer le dossier."
-#: src/main.c:370
+#: src/main.c:367
#, c-format
msgid ""
"Configuration for %s found.\n"
@@ -6682,7 +6682,7 @@ msgstr ""
"Une configuration pour %s a été trouvée.\n"
"Voulez-vous faire migrer cette configuration ?"
-#: src/main.c:372
+#: src/main.c:369
#, c-format
msgid ""
"\n"
@@ -6695,11 +6695,11 @@ msgstr ""
"Vos règles de filtrage pour Sylpheed peuvent être converties\n"
"par un script disponible ici : %s."
-#: src/main.c:384
+#: src/main.c:381
msgid "Keep old configuration"
msgstr "Conserver l'ancienne configuration"
-#: src/main.c:387
+#: src/main.c:384
msgid ""
"Keeping a backup will allow you to go back to an older version, but may take "
"a while if you have cached IMAP or News data, and will take some extra room "
@@ -6710,31 +6710,31 @@ msgstr ""
"IMAP ou provenant de serveurs de discussions, et occupera un espace "
"supplémentaire sur votre disque."
-#: src/main.c:395
+#: src/main.c:392
msgid "Migration of configuration"
msgstr "Migration de la configuration"
-#: src/main.c:406
+#: src/main.c:403
msgid "Copying configuration... This may take a while..."
msgstr "Copie de la configuration.. Cela peut prendre du temps.."
-#: src/main.c:415
+#: src/main.c:412
msgid "Migration failed!"
msgstr "La migration a échoué !"
-#: src/main.c:424
+#: src/main.c:421
msgid "Migrating configuration..."
msgstr "Migration de la configuration.."
-#: src/main.c:1139
+#: src/main.c:1129
msgid "g_thread is not supported by glib.\n"
msgstr "g_thread non supporté par glib.\n"
-#: src/main.c:1159 src/main.c:1163 src/main.c:1167
+#: src/main.c:1149 src/main.c:1153 src/main.c:1157
msgid "(or older)"
msgstr "(ou antérieure)"
-#: src/main.c:1502
+#: src/main.c:1492
#, c-format
msgid ""
"The following plugin failed to load. Check the Plugins configuration for "
@@ -6753,7 +6753,7 @@ msgstr[1] ""
"configuration des modules pour de plus amples informations :\n"
"%s"
-#: src/main.c:1544
+#: src/main.c:1534
msgid ""
"Claws Mail has detected a configured mailbox, but it is incomplete. It is "
"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6764,7 +6764,7 @@ msgstr ""
"Veuillez utiliser « Reconstruire l'_arborescence » depuis le menu contextuel "
"du dossier principal de la boîte aux lettres pour tenter de le résoudre."
-#: src/main.c:1550
+#: src/main.c:1540
msgid ""
"Claws Mail has detected a configured mailbox, but could not load it. It is "
"probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6774,36 +6774,36 @@ msgstr ""
"est probablement dû à la caducité d'un module externe. Veuillez ré-installer "
"le module et essayer à nouveau."
-#: src/main.c:1795
+#: src/main.c:1784
msgid "Missing filename\n"
msgstr "Nom de fichier manquant\n"
-#: src/main.c:1802
+#: src/main.c:1791
msgid "Cannot open filename for reading\n"
msgstr "Impossible d'ouvrir le fichier en lecture\n"
-#: src/main.c:1813
+#: src/main.c:1802
msgid "Malformed header\n"
msgstr "En-tête non conforme\n"
-#: src/main.c:1820
+#: src/main.c:1809
msgid "Duplicated 'To:' header\n"
msgstr "En-tête « À: » en plusieurs exemplaires\n"
-#: src/main.c:1831
+#: src/main.c:1820
msgid "Missing required 'To:' header\n"
msgstr "L'en-tête « À: » est manquant\n"
-#: src/main.c:1977
+#: src/main.c:1966
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Utilisation : %s [OPTION]..\n"
-#: src/main.c:1979
+#: src/main.c:1968
msgid " --compose [address] open composition window"
msgstr " --compose [adresse] ouvrir une fenêtre de composition de message"
-#: src/main.c:1980
+#: src/main.c:1969
msgid ""
" --compose-from-file file\n"
" open composition window with data from given file;\n"
@@ -6823,7 +6823,7 @@ msgstr ""
" jusqu'à une ligne vide, puis le corps de message "
"jusqu'à la fin de fichier"
-#: src/main.c:1985
+#: src/main.c:1974
msgid " --subscribe [uri] subscribe to the given URI if possible"
msgstr ""
" --subscribe [uri] s'abonner au flux RSS ou WebCal donné (requiert\n"
@@ -6831,7 +6831,7 @@ msgstr ""
" de nouvelles, ou « vCalendar » , gestionnaire de\n"
" rendez-vous et calendriers en ligne)"
-#: src/main.c:1986
+#: src/main.c:1975
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
@@ -6841,7 +6841,7 @@ msgstr ""
" ouvrir une fenêtre de composition avec les\n"
" fichiers spécifiés attachés"
-#: src/main.c:1989
+#: src/main.c:1978
msgid ""
" --insert file1 [file2]...\n"
" open composition window with specified files\n"
@@ -6851,25 +6851,25 @@ msgstr ""
" ouvrir une fenêtre de composition avec les\n"
" fichiers spécifiés insérés"
-#: src/main.c:1992
+#: src/main.c:1981
msgid " --receive receive new messages"
msgstr ""
" --receive récupérer les nouveaux messages (du compte courant)"
-#: src/main.c:1993
+#: src/main.c:1982
msgid " --receive-all receive new messages of all accounts"
msgstr ""
" --receive-all récupérer les nouveaux messages de tous les comptes"
-#: src/main.c:1994
+#: src/main.c:1983
msgid " --cancel-receiving cancel receiving of messages"
msgstr " --cancel-receiving annuler la récupération des messages"
-#: src/main.c:1995
+#: src/main.c:1984
msgid " --cancel-sending cancel sending of messages"
msgstr " --cancel-sending annuler l'envoi des messages"
-#: src/main.c:1996
+#: src/main.c:1985
msgid ""
" --search folder type request [recursive]\n"
" searches mail\n"
@@ -6889,17 +6889,17 @@ msgstr ""
" récursif: aucune si l'argument commence par 0, n, "
"N, f ou F"
-#: src/main.c:2003
+#: src/main.c:1992
msgid " --send send all queued messages"
msgstr " --send envoyer les messages en attente"
-#: src/main.c:2004
+#: src/main.c:1993
msgid " --status [folder]... show the total number of messages"
msgstr ""
" --status [dossier].. afficher le nombre de messages\n"
" (nouveaux, non lus, total)"
-#: src/main.c:2005
+#: src/main.c:1994
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
@@ -6907,15 +6907,15 @@ msgstr ""
" --status-full [dossier]..\n"
" afficher le nombre de messages de chaque dossier"
-#: src/main.c:2007
+#: src/main.c:1996
msgid " --statistics show session statistics"
msgstr " --statistics affiche les statistiques de la session"
-#: src/main.c:2008
+#: src/main.c:1997
msgid " --reset-statistics reset session statistics"
msgstr " --reset-statistics réinitialise les statistiques de la session"
-#: src/main.c:2009
+#: src/main.c:1998
msgid ""
" --select folder[/msg] jumps to the specified folder/message\n"
" folder is a folder id like 'folder/sub_folder'"
@@ -6926,35 +6926,35 @@ msgstr ""
"voici\n"
" un exemple de syntaxe : 'dossier/sous_dossier'"
-#: src/main.c:2011
+#: src/main.c:2000
msgid " --online switch to online mode"
msgstr " --online travailler en ligne"
-#: src/main.c:2012
+#: src/main.c:2001
msgid " --offline switch to offline mode"
msgstr " --offline travailler hors-ligne"
-#: src/main.c:2013
+#: src/main.c:2002
msgid " --exit --quit -q exit Claws Mail"
msgstr " --exit --quit -q quitter Claws Mail"
-#: src/main.c:2014
+#: src/main.c:2003
msgid " --debug debug mode"
msgstr " --debug lancer Claws Mail en mode de déboguage"
-#: src/main.c:2015
+#: src/main.c:2004
msgid " --toggle-debug toggle debug mode"
msgstr " --toggle-debug changer le mode debug"
-#: src/main.c:2016
+#: src/main.c:2005
msgid " --help -h display this help and exit"
msgstr " --help -h afficher cette aide et terminer"
-#: src/main.c:2017
+#: src/main.c:2006
msgid " --version -v output version information and exit"
msgstr " --version -v afficher la version et terminer"
-#: src/main.c:2018
+#: src/main.c:2007
msgid ""
" --version-full -V output version and built-in features information "
"and exit"
@@ -6962,12 +6962,12 @@ msgstr ""
" --version-full -V afficher la version et les informations concernant\n"
" les options intégrées et terminer"
-#: src/main.c:2019
+#: src/main.c:2008
msgid " --config-dir output configuration directory"
msgstr ""
" --config-dir afficher le dossier contenant la configuration"
-#: src/main.c:2020
+#: src/main.c:2009
msgid ""
" --alternate-config-dir [dir]\n"
" use specified configuration directory"
@@ -6975,7 +6975,7 @@ msgstr ""
" --alternate-config-dir [dir]\n"
" utiliser le dossier de configuration spécifié"
-#: src/main.c:2022
+#: src/main.c:2011
msgid ""
" --geometry -geometry WxH+X+Y\n"
" set geometry for main window"
@@ -6983,36 +6983,36 @@ msgstr ""
" --geometry -geometry LxH+X+Y\n"
" définir la géométrie de la fenêtre principale"
-#: src/main.c:2075
+#: src/main.c:2064
msgid "Unknown option\n"
msgstr ""
"claws-mail: option non reconnue.\n"
"Pour en savoir davantage, faites: « claws-mail --help ».\n"
-#: src/main.c:2093
+#: src/main.c:2082
#, c-format
msgid "Processing (%s)..."
msgstr "Traitement (%s).."
-#: src/main.c:2096
+#: src/main.c:2085
msgid "top level folder"
msgstr "dossier racine"
-#: src/main.c:2178
+#: src/main.c:2167
msgid "Queued messages"
msgstr "Messages en file d'attente"
-#: src/main.c:2179
+#: src/main.c:2168
msgid "Some unsent messages are queued. Exit now?"
msgstr ""
"Quelques messages non envoyés sont dans la file d'attente. Voulez-vous "
"quitter maintenant ?"
-#: src/main.c:2926
+#: src/main.c:2915
msgid "NetworkManager: network is online.\n"
msgstr "Gestionnaire réseau : le réseau est activé.\n"
-#: src/main.c:2932
+#: src/main.c:2921
msgid "NetworkManager: network is offline.\n"
msgstr "Gestionnaire réseau : le réseau est désactivé.\n"
@@ -7439,7 +7439,7 @@ msgstr "La_bels"
msgid "Re-_edit"
msgstr "Rééd_iter"
-#: src/mainwindow.c:731 src/messageview.c:310 src/mimeview.c:1013
+#: src/mainwindow.c:731 src/messageview.c:310 src/mimeview.c:1015
msgid "Check signature"
msgstr "Vérifier la signature"
@@ -7755,11 +7755,11 @@ msgstr "Par _verrouillés"
msgid "D_on't sort"
msgstr "Ne pas tr_ier"
-#: src/mainwindow.c:873 src/prefs_summaries.c:460
+#: src/mainwindow.c:873 src/prefs_summaries.c:462
msgid "Ascending"
msgstr "Ascendant"
-#: src/mainwindow.c:874 src/prefs_summaries.c:461
+#: src/mainwindow.c:874 src/prefs_summaries.c:463
msgid "Descending"
msgstr "Descendant"
@@ -7767,68 +7767,68 @@ msgstr "Descendant"
msgid "_Auto detect"
msgstr "Détection _automatique"
-#: src/mainwindow.c:1294 src/summaryview.c:6370
+#: src/mainwindow.c:1294 src/summaryview.c:6414
msgid "Apply tags..."
msgstr "Appliquer des labels.."
-#: src/mainwindow.c:1942
+#: src/mainwindow.c:1943
msgid "Some error(s) happened. Click here to view log."
msgstr ""
"Une ou plusieurs erreurs sont survenues. Cliquer ici pour voir les traces."
-#: src/mainwindow.c:1957
+#: src/mainwindow.c:1958
msgid "You are online. Click the icon to go offline"
msgstr "Vous êtes en ligne. Cliquer sur l'icône pour aller hors-ligne."
-#: src/mainwindow.c:1960
+#: src/mainwindow.c:1961
msgid "You are offline. Click the icon to go online"
msgstr "Vous êtes hors-ligne. Cliquer sur l'icône pour aller en ligne."
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1975
msgid "Select account"
msgstr "Sélectionner un compte"
-#: src/mainwindow.c:2001 src/prefs_logging.c:136
+#: src/mainwindow.c:2002 src/prefs_logging.c:136
msgid "Network log"
msgstr "Traces réseau"
-#: src/mainwindow.c:2005
+#: src/mainwindow.c:2006
msgid "Filtering/Processing debug log"
msgstr "Traces de débogage du filtrage/traitement"
-#: src/mainwindow.c:2024 src/prefs_logging.c:378
+#: src/mainwindow.c:2025 src/prefs_logging.c:378
msgid "filtering log enabled\n"
msgstr "Le traçage du filtrage est activé.\n"
-#: src/mainwindow.c:2026 src/prefs_logging.c:380
+#: src/mainwindow.c:2027 src/prefs_logging.c:380
msgid "filtering log disabled\n"
msgstr "Le traçage du filtrage est désactivé.\n"
-#: src/mainwindow.c:2462 src/mainwindow.c:2469 src/mainwindow.c:2512
-#: src/mainwindow.c:2545 src/mainwindow.c:2577 src/mainwindow.c:2622
+#: src/mainwindow.c:2463 src/mainwindow.c:2470 src/mainwindow.c:2513
+#: src/mainwindow.c:2546 src/mainwindow.c:2578 src/mainwindow.c:2623
#: src/plugins/notification/notification_trayicon.c:372
#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1076
msgid "Untitled"
msgstr "Sans titre"
-#: src/mainwindow.c:2623 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2624 src/prefs_summary_open.c:114
msgid "none"
msgstr "rien"
-#: src/mainwindow.c:2880 src/mainwindow.c:2885
+#: src/mainwindow.c:2881 src/mainwindow.c:2886
msgid "Delete all messages in trash folders?"
msgstr ""
"Voulez-vous vraiment supprimer tous les messages de toutes les corbeilles ?"
-#: src/mainwindow.c:2881
+#: src/mainwindow.c:2882
msgid "Don't quit"
msgstr "Ne pas quitter"
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2913 src/plugins/mailmbox/plugin_gtk.c:189
msgid "Add mailbox"
msgstr "Nouvelle boîte aux lettres"
-#: src/mainwindow.c:2913
+#: src/mainwindow.c:2914
msgid ""
"Input the location of mailbox.\n"
"If an existing mailbox is specified, it will be\n"
@@ -7837,18 +7837,18 @@ msgstr ""
"Saisir le chemin vers la boîte aux lettres :\n"
"Si elle existe déjà, elle sera automatiquement analysée."
-#: src/mainwindow.c:2919 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2920 src/plugins/mailmbox/plugin_gtk.c:196
#: src/plugins/rssyl/rssyl_gtk.c:132
#, c-format
msgid "The mailbox '%s' already exists."
msgstr "La boîte aux lettres '%s' existe déjà."
-#: src/mainwindow.c:2924 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2925 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
#: src/wizard.c:741
msgid "Mailbox"
msgstr "Boîte aux lettres"
-#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2930 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
msgid ""
"Creation of the mailbox failed.\n"
"Maybe some files already exist, or you don't have the permission to write "
@@ -7858,55 +7858,55 @@ msgstr ""
"Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
"en écriture."
-#: src/mainwindow.c:3410
+#: src/mainwindow.c:3411
msgid "No posting allowed"
msgstr "Envoi de message non autorisé"
-#: src/mainwindow.c:3993
+#: src/mainwindow.c:3994
msgid "Mbox import has failed."
msgstr "L'importation mbox a échoué."
-#: src/mainwindow.c:4002 src/mainwindow.c:4011
+#: src/mainwindow.c:4003 src/mainwindow.c:4012
msgid "Export to mbox has failed."
msgstr "L'exportation mbox a échoué."
-#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4053 src/plugins/notification/notification_trayicon.c:550
msgid "Exit"
msgstr "Quitter"
-#: src/mainwindow.c:4052 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4053 src/plugins/notification/notification_trayicon.c:550
msgid "Exit Claws Mail?"
msgstr "Voulez-vous vraiment quitter Claws Mail ?"
-#: src/mainwindow.c:4243
+#: src/mainwindow.c:4244
msgid "Folder synchronisation"
msgstr "Synchronisation de dossiers distants"
-#: src/mainwindow.c:4244
+#: src/mainwindow.c:4245
msgid "Do you want to synchronise your folders now?"
msgstr "Voulez-vous vraiment synchroniser vos dossiers distants ?"
-#: src/mainwindow.c:4245
+#: src/mainwindow.c:4246
msgid "_Synchronise"
msgstr "_Synchroniser"
-#: src/mainwindow.c:4693
+#: src/mainwindow.c:4694
msgid "Deleting duplicated messages..."
msgstr "Suppression des messages en double.."
-#: src/mainwindow.c:4703
+#: src/mainwindow.c:4704
msgid "No duplicate message found in selected folder.\n"
msgstr ""
"Aucun message en double n'a pu être trouvé dans le dossier sélectionné.\n"
-#: src/mainwindow.c:4709
+#: src/mainwindow.c:4710
#, c-format
msgid "Deleted %d duplicate message in selected folder.\n"
msgid_plural "Deleted %d duplicate messages in selected folder.\n"
msgstr[0] "%d message en double supprimé dans le dossier sélectionné.\n"
msgstr[1] "%d messages en double supprimés dans le dossier sélectionné.\n"
-#: src/mainwindow.c:4713
+#: src/mainwindow.c:4714
#, c-format
msgid "Marked %d duplicate message for deletion in selected folder.\n"
msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
@@ -7915,61 +7915,61 @@ msgstr[0] ""
msgstr[1] ""
"%d messages en double marqués pour suppression dans le dossier sélectionné.\n"
-#: src/mainwindow.c:4751
+#: src/mainwindow.c:4752
msgid "Deleting duplicated messages in all folders..."
msgstr "Suppression des messages en double dans tous les dossiers.."
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4758
#, c-format
msgid "Deleted %d duplicate message in %d folders.\n"
msgid_plural "Deleted %d duplicate messages in %d folders.\n"
msgstr[0] "%d message en double supprimé dans %d dossier.\n"
msgstr[1] "%d messages en double supprimés dans %d dossiers.\n"
-#: src/mainwindow.c:4762
+#: src/mainwindow.c:4763
#, c-format
msgid "No duplicate message found in %d folders.\n"
msgstr "Aucune message en double trouvé dans %d dossiers.\n"
-#: src/mainwindow.c:4924 src/messageview.c:2657
+#: src/mainwindow.c:4925 src/messageview.c:2654
msgid "Select folder to go to"
msgstr "Sélection du dossier à atteindre"
-#: src/mainwindow.c:5025 src/summaryview.c:5861
+#: src/mainwindow.c:5026 src/summaryview.c:5857
msgid "Processing rules to apply before folder rules"
msgstr "Règles de traitement à appliquer avant le filtrage des dossiers"
-#: src/mainwindow.c:5033
+#: src/mainwindow.c:5034
msgid "Processing rules to apply after folder rules"
msgstr "Règles de traitement à appliquer après le filtrage des dossiers"
-#: src/mainwindow.c:5041 src/summaryview.c:5872
+#: src/mainwindow.c:5042 src/summaryview.c:5868
msgid "Filtering configuration"
msgstr "Règles de filtrage"
-#: src/mainwindow.c:5156
+#: src/mainwindow.c:5157
msgid "Can not register as default client: impossible to get executable path."
msgstr ""
"Impossible d'enregistrer le client par défaut : impossible de récupérer le "
"chemin du binaire."
-#: src/mainwindow.c:5215
+#: src/mainwindow.c:5216
msgid "Claws Mail has been registered as default client."
msgstr "Claws Mail est maintenant le client par défaut."
-#: src/mainwindow.c:5217
+#: src/mainwindow.c:5218
msgid ""
"Can not register as default client: impossible to write to the registry."
msgstr ""
"Impossible d'enregistrer le client par défaut : écriture impossible dans la "
"base de registre."
-#: src/mainwindow.c:5231 src/setup.c:91
+#: src/mainwindow.c:5232 src/setup.c:91
#, c-format
msgid "Scanning folder %s%c%s..."
msgstr "Analyse du dossier %s%c%s.."
-#: src/mainwindow.c:5375
+#: src/mainwindow.c:5376
#, c-format
msgid "Forgotten %d password in %d accounts.\n"
msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -8049,7 +8049,7 @@ msgstr "Écrasement du fichier mbox"
msgid "This file already exists. Do you want to overwrite it?"
msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
-#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1842
+#: src/mbox.c:551 src/messageview.c:1861 src/mimeview.c:1844
#: src/prefs_themes.c:598 src/textview.c:3095
msgid "Overwrite"
msgstr "Écraser"
@@ -8099,7 +8099,7 @@ msgstr "Recherche terminée"
msgid "Compose _new message"
msgstr "Composer un _nouveau message"
-#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
+#: src/messageview.c:712 src/messageview.c:1453 src/messageview.c:1604
msgid "Claws Mail - Message View"
msgstr "Claws Mail - Message"
@@ -8140,47 +8140,47 @@ msgstr ""
"destinataire officiel.\n"
"Il est conseillé de ne pas envoyer cet accusé de réception."
-#: src/messageview.c:1385
+#: src/messageview.c:1383
#, c-format
msgid "Fetching message (%s)..."
msgstr "Lecture du message (%s) en cours.."
-#: src/messageview.c:1421 src/procmime.c:1009
+#: src/messageview.c:1419 src/procmime.c:1011
#, c-format
msgid "Couldn't decrypt: %s"
msgstr "Déchiffrement impossible : %s"
-#: src/messageview.c:1502 src/messageview.c:1510
+#: src/messageview.c:1500 src/messageview.c:1508
msgid "Message doesn't conform to MIME standard. It may render wrongly."
msgstr ""
"Le message n'est pas conforme au standard MIME. Il pourrait être mal affiché."
-#: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2047
-#: src/plugins/fancy/fancy_viewer.c:707 src/summaryview.c:4964
-#: src/summaryview.c:4967 src/textview.c:3083
+#: src/messageview.c:1853 src/messageview.c:1856 src/mimeview.c:2049
+#: src/plugins/fancy/fancy_viewer.c:707 src/summaryview.c:4960
+#: src/summaryview.c:4963 src/textview.c:3083
msgid "Save as"
msgstr "Enregistrer sous"
-#: src/messageview.c:1865
+#: src/messageview.c:1862
msgid "Overwrite existing file?"
msgstr "Écraser le fichier existant ?"
-#: src/messageview.c:1873 src/summaryview.c:4984 src/summaryview.c:4987
-#: src/summaryview.c:5002
+#: src/messageview.c:1870 src/summaryview.c:4980 src/summaryview.c:4983
+#: src/summaryview.c:4998
#, c-format
msgid "Couldn't save the file '%s'."
msgstr "Impossible d'enregistrer le fichier « %s »."
-#: src/messageview.c:1926
+#: src/messageview.c:1923
#, c-format
msgid "Show all %s."
msgstr "Afficher l'ensemble des %s."
-#: src/messageview.c:1928
+#: src/messageview.c:1925
msgid "Only the first megabyte of text is shown."
msgstr "Seul le premier méga-octet de texte est affiché."
-#: src/messageview.c:1959
+#: src/messageview.c:1956
msgid ""
"You got a return receipt for this message: it has been displayed by the "
"recipient."
@@ -8188,19 +8188,19 @@ msgstr ""
"Vous avez demandé un accusé de réception pour ce message : cela a été mis en "
"évidence pour le destinataire."
-#: src/messageview.c:1962
+#: src/messageview.c:1959
msgid "You asked for a return receipt in this message."
msgstr "Vous avez demandé un accusé de réception pour ce message."
-#: src/messageview.c:1968
+#: src/messageview.c:1965
msgid "This message asks for a return receipt."
msgstr "Ce message demande l'envoi d'un accusé de réception."
-#: src/messageview.c:1969
+#: src/messageview.c:1966
msgid "Send receipt"
msgstr "Envoyer"
-#: src/messageview.c:2012
+#: src/messageview.c:2009
msgid ""
"This message has been partially retrieved,\n"
"and has been deleted from the server."
@@ -8208,7 +8208,7 @@ msgstr ""
"Ce message a été partiellement récupéré,\n"
"et a été supprimé du serveur."
-#: src/messageview.c:2018
+#: src/messageview.c:2015
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8217,16 +8217,16 @@ msgstr "Ce message a été partiellement récupéré ; il fait %s au total."
# NDT : problème de longueur de la chaîne "Marquer pour téléchargement" :
# la chaîne est coupée des 2 côtés (bouton trop petit) -> idée : tooltips
-#: src/messageview.c:2022 src/messageview.c:2044
+#: src/messageview.c:2019 src/messageview.c:2041
msgid "Mark for download"
msgstr "Télécharger"
# NDT : même pb qu'avec "Mark for download" pr chaîne "Marquer pour suppression"
-#: src/messageview.c:2023 src/messageview.c:2035
+#: src/messageview.c:2020 src/messageview.c:2032
msgid "Mark for deletion"
msgstr "Supprimer"
-#: src/messageview.c:2028
+#: src/messageview.c:2025
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8235,12 +8235,12 @@ msgstr ""
"Ce message a été partiellement récupéré ;\n"
"il fait %s au total et est marqué pour être téléchargé ultérieurement."
-#: src/messageview.c:2033 src/messageview.c:2046
+#: src/messageview.c:2030 src/messageview.c:2043
#: src/prefs_filtering_action.c:180 src/toolbar.c:506
msgid "Unmark"
msgstr "Démarquer"
-#: src/messageview.c:2039
+#: src/messageview.c:2036
#, c-format
msgid ""
"This message has been partially retrieved;\n"
@@ -8249,11 +8249,11 @@ msgstr ""
"Ce message a été partiellement récupéré ;\n"
"il fait %s au total et est marqué pour être supprimé ultérieurement."
-#: src/messageview.c:2112
+#: src/messageview.c:2109
msgid "Return Receipt Notification"
msgstr "Accusé de réception."
-#: src/messageview.c:2113
+#: src/messageview.c:2110
msgid ""
"More than one of your accounts uses the address that this message was sent "
"to.\n"
@@ -8265,19 +8265,19 @@ msgstr ""
"Veuillez choisir le compte que vous voulez utiliser pour l'envoi de l'accusé "
"de réception :"
-#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:484
+#: src/messageview.c:2114 src/plugins/rssyl/rssyl_feed_props.c:484
msgid "_Cancel"
msgstr "A_nnuler"
-#: src/messageview.c:2117
+#: src/messageview.c:2114
msgid "_Send Notification"
msgstr "_Envoyer"
-#: src/messageview.c:2206
+#: src/messageview.c:2203
msgid "Cannot print: the message doesn't contain text."
msgstr "Impossible d'imprimer : le message ne contient pas de texte."
-#: src/messageview.c:2967
+#: src/messageview.c:2964
msgid ""
"\n"
" There are no messages in this folder"
@@ -8285,7 +8285,7 @@ msgstr ""
"\n"
" Il n'y a pas de messages dans ce dossier"
-#: src/messageview.c:2975
+#: src/messageview.c:2972
msgid ""
"\n"
" Message has been deleted"
@@ -8293,7 +8293,7 @@ msgstr ""
"\n"
" Le message a été supprimé"
-#: src/messageview.c:2976
+#: src/messageview.c:2973
msgid ""
"\n"
" Message has been deleted or moved to another folder"
@@ -8301,8 +8301,8 @@ msgstr ""
"\n"
" Le message a été supprimé ou déplacé vers un autre dossier"
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4362
-#: src/summaryview.c:7137
+#: src/messageview.c:3006 src/messageview.c:3012 src/summaryview.c:4358
+#: src/summaryview.c:7181
msgid "An error happened while learning.\n"
msgstr "Erreur lors de l'opération d'apprentissage du module SpamAssassin.\n"
@@ -8371,32 +8371,32 @@ msgstr "_Enregistrer tout sous.."
msgid "MIME Type"
msgstr "Type MIME"
-#: src/mimeview.c:1018 src/mimeview.c:1023 src/mimeview.c:1028
-#: src/mimeview.c:1033
+#: src/mimeview.c:1020 src/mimeview.c:1025 src/mimeview.c:1030
+#: src/mimeview.c:1035
msgid "View full information"
msgstr "Voir l'ensemble des informations"
-#: src/mimeview.c:1039
+#: src/mimeview.c:1041
msgid "Check again"
msgstr "Vérifier à nouveau"
-#: src/mimeview.c:1051
+#: src/mimeview.c:1053
#, c-format
msgid "%s Click the icon to check it."
msgstr "%s Cliquer sur l'icône pour la vérifier."
-#: src/mimeview.c:1053
+#: src/mimeview.c:1055
#, c-format
msgid "%s Click the icon or hit '%s' to check it."
msgstr "%s Cliquer sur l'icône ou presser la touche '%s' pour la vérifier."
-#: src/mimeview.c:1063
+#: src/mimeview.c:1065
msgid "Timeout checking the signature. Click the icon to try again."
msgstr ""
"Délai d'attente dépassé durant la vérification de la signature. Cliquer sur "
"l'icône pour essayer à nouveau."
-#: src/mimeview.c:1065
+#: src/mimeview.c:1067
#, c-format
msgid ""
"Timeout checking the signature. Click the icon or hit '%s' to try again."
@@ -8404,27 +8404,27 @@ msgstr ""
"Délai d'attente dépassé durant la vérification de la signature. Cliquer sur "
"l'icône ou appuyer sur '%s' pour essayer à nouveau."
-#: src/mimeview.c:1305
+#: src/mimeview.c:1307
msgid "Checking signature..."
msgstr "Vérification de la signature en cours.."
-#: src/mimeview.c:1346
+#: src/mimeview.c:1348
msgid "Go back to email"
msgstr "Revenir à l'email"
-#: src/mimeview.c:1760 src/mimeview.c:1852 src/mimeview.c:2094
-#: src/mimeview.c:2130 src/mimeview.c:2242 src/plugins/fancy/fancy_viewer.c:447
+#: src/mimeview.c:1762 src/mimeview.c:1854 src/mimeview.c:2096
+#: src/mimeview.c:2132 src/mimeview.c:2244 src/plugins/fancy/fancy_viewer.c:447
#, c-format
msgid "Couldn't save the part of multipart message: %s"
msgstr ""
"Échec lors de l'enregistrement d'une partie d'un message multipart : %s"
-#: src/mimeview.c:1839 src/textview.c:3093
+#: src/mimeview.c:1841 src/textview.c:3093
#, c-format
msgid "Overwrite existing file '%s'?"
msgstr "Écraser le fichier existant « %s » ?"
-#: src/mimeview.c:1863
+#: src/mimeview.c:1865
#, c-format
msgid ""
"An error has occurred while saving message part #%d. Do you want to cancel "
@@ -8433,54 +8433,54 @@ msgstr ""
"Une erreur est survenue lors de l'enregistrement de la partie #%d du "
"message. Voulez-vous annuler l'opération, ou ignorer l'erreur et continuer ?"
-#: src/mimeview.c:1866
+#: src/mimeview.c:1868
msgid "Error saving all message parts"
msgstr "Erreur lors de l'enregistrement des parties du message"
-#: src/mimeview.c:1867
+#: src/mimeview.c:1869
msgid "Skip"
msgstr "Ignorer"
-#: src/mimeview.c:1867
+#: src/mimeview.c:1869
msgid "Skip all"
msgstr "Tout ignorer"
-#: src/mimeview.c:1877
+#: src/mimeview.c:1879
#, c-format
msgid "%d file saved successfully."
msgid_plural "%d files saved successfully."
msgstr[0] "%d fichier enregistré avec succès."
msgstr[1] "%d fichiers enregistrés avec succès."
-#: src/mimeview.c:1885
+#: src/mimeview.c:1887
#, c-format
msgid "%d file saved successfully"
msgid_plural "%d files saved successfully"
msgstr[0] "%d fichier enregistré avec succès"
msgstr[1] "%d fichiers enregistrés avec succès."
-#: src/mimeview.c:1890
+#: src/mimeview.c:1892
#, c-format
msgid "%s, %d file failed."
msgid_plural "%s, %d files failed."
msgstr[0] "%s, %d fichier en échec."
msgstr[1] "%s, %d fichiers en échec."
-#: src/mimeview.c:1923 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1925 src/plugins/archive/archiver_prefs.c:142
#: src/prefs_filtering_action.c:1280
msgid "Select destination folder"
msgstr "Sélection du dossier de destination"
-#: src/mimeview.c:1930 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1932 src/plugins/archive/archiver_prefs.c:148
#, c-format
msgid "'%s' is not a directory."
msgstr "« %s » n'est pas un dossier."
-#: src/mimeview.c:2177 src/mimeview.c:2184 src/textview.c:3010
+#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3010
msgid "Open with"
msgstr "Ouvrir avec"
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3011
+#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3011
#, c-format
msgid ""
"Enter the command-line to open file:\n"
@@ -8489,7 +8489,7 @@ msgstr ""
"Sisir la ligne de commande pour ouvrir le fichier :\n"
"('%s' sera remplacé par le chemin du fichier)"
-#: src/mimeview.c:2280
+#: src/mimeview.c:2282
#, c-format
msgid ""
"Could not convert attachment name to UTF-16:\n"
@@ -8500,11 +8500,11 @@ msgstr ""
"\n"
"%s"
-#: src/mimeview.c:2288
+#: src/mimeview.c:2290
msgid "Execute untrusted binary?"
msgstr "Exécuter un binaire inconnu ?"
-#: src/mimeview.c:2289
+#: src/mimeview.c:2291
msgid ""
"This attachment is an executable file. Executing untrusted binaries is "
"dangerous and could probably lead to compromission of your computer.\n"
@@ -8517,22 +8517,22 @@ msgstr ""
"\n"
"Voulez-vous exécuter ce binaire ?"
-#: src/mimeview.c:2293
+#: src/mimeview.c:2295
msgid "Run binary"
msgstr "Exécuter le binaire"
-#: src/mimeview.c:2595 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2598 src/plugins/att_remover/att_remover.c:304
msgid "Type:"
msgstr "Type :"
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:305
+#: src/mimeview.c:2599 src/plugins/att_remover/att_remover.c:305
#: src/plugins/pdf_viewer/poppler_viewer.c:701 src/summaryview.c:2743
msgid "Size:"
msgstr "Taille :"
-#: src/mimeview.c:2610 src/plugins/vcalendar/vcalendar.c:1253
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1699
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
+#: src/mimeview.c:2613 src/plugins/vcalendar/vcalendar.c:1253
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1698
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
msgid "Description:"
msgstr "Description :"
@@ -9075,7 +9075,7 @@ msgstr "Oui"
#: src/plugins/archive/archiver_gtk.c:844
#: src/plugins/archive/archiver_gtk.c:852
#: src/plugins/pdf_viewer/poppler_viewer.c:723 src/prefs_folder_item.c:520
-#: src/prefs_summaries.c:378
+#: src/prefs_summaries.c:380
msgid "No"
msgstr "Non"
@@ -9327,7 +9327,7 @@ msgstr "Supprimer les pièces jointes"
msgid "Remove"
msgstr "Supprimer"
-#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:449
+#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
#: src/prefs_summary_column.c:79 src/summaryview.c:2837
msgid "Attachment"
msgstr "Pièces jointes"
@@ -10812,7 +10812,7 @@ msgstr ""
#: src/plugins/libravatar/libravatar_prefs.c:410
msgid "Request timeout"
-msgstr "Délai d'attente de requête"
+msgstr "Délai d'expiration de requête"
#: src/plugins/libravatar/libravatar_prefs.c:410
msgid "second(s)"
@@ -10926,7 +10926,7 @@ msgstr "Méthode d'authentification non disponible"
msgid "sending error on Sieve session: %s\n"
msgstr "erreur d'envoi lors de la session Sieve : %s\n"
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5758
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5754
msgid "_Filter"
msgstr "_Filtrer"
@@ -11456,7 +11456,7 @@ msgid "Never"
msgstr "Jamais"
#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:227
-#: src/prefs_summaries.c:491 src/prefs_summaries.c:501
+#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
msgid "Always"
msgstr "Toujours"
@@ -11555,7 +11555,7 @@ msgstr "Délai de disparition de la popup"
#: src/plugins/notification/notification_prefs.c:1367
#: src/plugins/notification/notification_prefs.c:1673
#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_other.c:570
-#: src/prefs_receive.c:201 src/prefs_summaries.c:540
+#: src/prefs_receive.c:201 src/prefs_summaries.c:542
msgid "seconds"
msgstr "secondes"
@@ -13184,17 +13184,17 @@ msgid "Updating comments for '%s'..."
msgstr "Mise à jour des commentaires pour %s.."
#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/vcalendar/vcal_folder.c:1619
msgid "401 (Authorisation required)"
msgstr "401 (Autorisation requise)"
#: src/plugins/rssyl/rssyl_update_feed.c:110
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1622
msgid "403 (Unauthorised)"
msgstr "403 (Non autorisé)"
#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/vcalendar/vcal_folder.c:1625
msgid "404 (Not found)"
msgstr "404 (Non trouvé)"
@@ -13852,25 +13852,25 @@ msgid "You are already busy at this time."
msgstr "Vous n'êtes pas disponible actuellement."
#: src/plugins/vcalendar/vcalendar.c:1247
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
msgid "Event:"
msgstr "Évènement :"
#: src/plugins/vcalendar/vcalendar.c:1248
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1695
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1694
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
msgid "Organizer:"
msgstr "Organisateur :"
#: src/plugins/vcalendar/vcalendar.c:1249
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1698
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1697
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
msgid "Location:"
msgstr "Endroit :"
#: src/plugins/vcalendar/vcalendar.c:1250
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1696
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1695
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
msgid "Summary:"
msgstr "Résumé :"
@@ -13883,8 +13883,8 @@ msgid "Ending:"
msgstr "Fin :"
#: src/plugins/vcalendar/vcalendar.c:1254
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1700
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1710
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1699
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
msgid "Attendees:"
msgstr "Invités :"
@@ -13957,17 +13957,17 @@ msgstr ""
"\n"
"Voici les évènements planifiés %s :\n"
-#: src/plugins/vcalendar/vcal_folder.c:1611
+#: src/plugins/vcalendar/vcal_folder.c:1610
#, c-format
msgid "Timeout (%d seconds) connecting to %s\n"
msgstr "Délai d'attente dépassé (%d secondes) lors de la connexion à %s\n"
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1628
#, c-format
msgid "Error %ld"
msgstr "Erreur %ld"
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1810
#, c-format
msgid ""
"Could not retrieve the Webcal URL:\n"
@@ -13980,7 +13980,7 @@ msgstr ""
"\n"
"%s"
-#: src/plugins/vcalendar/vcal_folder.c:1837
+#: src/plugins/vcalendar/vcal_folder.c:1836
#, c-format
msgid ""
"This URL does not look like a Webcal URL:\n"
@@ -13991,47 +13991,47 @@ msgstr ""
"%s\n"
"%s"
-#: src/plugins/vcalendar/vcal_folder.c:1868
-#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1867
+#: src/plugins/vcalendar/vcal_folder.c:1870
#, c-format
msgid "Could not create directory %s"
msgstr "Impossible de créer le dossier %s."
-#: src/plugins/vcalendar/vcal_folder.c:1911
+#: src/plugins/vcalendar/vcal_folder.c:1910
msgid "Claws Mail needs network access in order to update the Webcal feed."
msgstr ""
"Claws Mail nécessite un accès réseau pour accéder au calendrier Webcal."
-#: src/plugins/vcalendar/vcal_folder.c:1922
+#: src/plugins/vcalendar/vcal_folder.c:1921
#, c-format
msgid "Fetching calendar for %s..."
msgstr "Récupération du calendrier pour %s.."
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1922
msgid "new subscription"
msgstr "Nouvelle inscription"
-#: src/plugins/vcalendar/vcal_folder.c:1934
+#: src/plugins/vcalendar/vcal_folder.c:1933
msgid "Claws Mail needs network access in order to update the subscription."
msgstr "Claws Mail nécessite un accès réseau pour mettre à jour l'abonnement."
-#: src/plugins/vcalendar/vcal_folder.c:1946
+#: src/plugins/vcalendar/vcal_folder.c:1945
msgid "Subscribe to Webcal"
msgstr "Souscrire à un calendrier en ligne (Webcal)"
-#: src/plugins/vcalendar/vcal_folder.c:1946
+#: src/plugins/vcalendar/vcal_folder.c:1945
msgid "Enter the WebCal URL:"
msgstr "Saisir l'URL du calendrier en ligne (WebCal) :"
-#: src/plugins/vcalendar/vcal_folder.c:1958
+#: src/plugins/vcalendar/vcal_folder.c:1957
msgid "Could not parse the URL."
msgstr "Impossible de comprendre l'URL."
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1985
msgid "Do you really want to unsubscribe?"
msgstr "Voulez-vous vraiment vous désinscrire ?"
-#: src/plugins/vcalendar/vcal_folder.c:1987
+#: src/plugins/vcalendar/vcal_folder.c:1986
msgid "Delete subscription"
msgstr "Supprimer la souscription"
@@ -14067,35 +14067,35 @@ msgstr "ressource"
msgid "room"
msgstr "pièce"
-#: src/plugins/vcalendar/vcal_manager.c:558
+#: src/plugins/vcalendar/vcal_manager.c:559
msgid "Past"
msgstr "Dans le passé"
-#: src/plugins/vcalendar/vcal_manager.c:561
+#: src/plugins/vcalendar/vcal_manager.c:562
msgid "Today"
msgstr "Aujourd'hui"
-#: src/plugins/vcalendar/vcal_manager.c:564
+#: src/plugins/vcalendar/vcal_manager.c:565
msgid "Tomorrow"
msgstr "Demain"
-#: src/plugins/vcalendar/vcal_manager.c:567
+#: src/plugins/vcalendar/vcal_manager.c:568
msgid "This week"
msgstr "Cette semaine"
-#: src/plugins/vcalendar/vcal_manager.c:570
+#: src/plugins/vcalendar/vcal_manager.c:571
msgid "Later"
msgstr "Plus tard"
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1247
msgid "Accepted: "
msgstr "Accepté : "
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1249
msgid "Declined: "
msgstr "Refusé : "
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1251
msgid "Tentatively Accepted: "
msgstr "Accepté sous réserves : "
@@ -14296,61 +14296,61 @@ msgstr ""
"Impossible d'envoyer l'invitation.\n"
"Veuillez vérifier les destinataires."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1451
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1450
msgid "Save & Send"
msgstr "Enregistrer & envoyer"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1452
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1451
msgid "Check availability"
msgstr "Vérifier la disponibilité"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1575
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1574
msgid "Starts at:"
msgstr "Débute à :"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1581
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1580
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
msgid "on:"
msgstr "le :"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1599
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
msgid "Ends at:"
msgstr "Se termine à :"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1640
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1639
msgid "New meeting"
msgstr "Nouveau rendez-vous"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1642
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1641
#, c-format
msgid "%s - Edit meeting"
msgstr "%s - Modifier le rendez-vous"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1697
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1696
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
msgid "Time:"
msgstr "Période :"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1854
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1853
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1857
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1856
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1868
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
#, c-format
msgid "Upcoming event: %s"
msgstr "Évènement en instance : %s"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1869
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1868
#, c-format
msgid ""
"You have a meeting or event soon.\n"
@@ -14367,39 +14367,39 @@ msgstr ""
"\n"
"%s"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1886
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1885
#, c-format
msgid "Remind me in %d minute"
msgid_plural "Remind me in %d minutes"
msgstr[0] "M'avertir à nouveau dans %d minute"
msgstr[1] "M'avertir à nouveau dans %d minutes"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2012
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2011
msgid "Empty calendar"
msgstr "Calendrier vide"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2013
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2012
msgid "There is nothing to export."
msgstr "Il n'y a rien à exporter."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2053
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2052
msgid "Could not export the calendar."
msgstr "Impossible d'exporter le calendrier."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2070
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2069
msgid "Export calendar to ICS"
msgstr "Exporter le calendrier au format ICS"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2093
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2092
#, c-format
msgid "Couldn't export calendar to '%s'\n"
msgstr "Impossible d'exporter le calendrier vers '%s'.\n"
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2209
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2208
msgid "Could not export the freebusy info."
msgstr "Impossible d'exporter les informations de disponibilité."
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2240
#, c-format
msgid "Couldn't export free/busy to '%s'\n"
msgstr "Impossible d'exporter les informations de disponibilité vers '%s'\n"
@@ -14777,7 +14777,7 @@ msgstr "S'authentifier sur le POP avant l'envoi"
#: src/prefs_account.c:1913
msgid "POP authentication timeout"
-msgstr "Délai d'attente maximal pour l'authentification POP"
+msgstr "Délai maximal pour l'authentification POP"
#: src/prefs_account.c:2001 src/prefs_account.c:2047
msgid "Signature"
@@ -15099,7 +15099,7 @@ msgstr "Remplace l'action sélectionnée dans la liste par l'action ci-dessus"
#: src/prefs_actions.c:337 src/prefs_filtering_action.c:600
#: src/prefs_filtering.c:486 src/prefs_matcher.c:775 src/prefs_template.c:319
-#: src/prefs_toolbar.c:1023
+#: src/prefs_toolbar.c:1024
msgid "D_elete"
msgstr "Supprim_er"
@@ -15609,7 +15609,7 @@ msgstr "Cacher"
msgid "Message flags"
msgstr "États de message"
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:447
+#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
#: src/prefs_summary_column.c:77 src/summaryview.c:2843 src/toolbar.c:505
msgid "Mark"
msgstr "Marquer"
@@ -15635,7 +15635,7 @@ msgstr "Marquer comme courrier légitime"
msgid "Execute"
msgstr "Exécuter"
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:445
+#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
msgid "Color label"
msgstr "Couleur"
@@ -15650,7 +15650,7 @@ msgstr "Rediriger"
#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
#: src/prefs_filtering_action.c:1422 src/prefs_matcher.c:628
-#: src/prefs_summaries.c:450 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
#: src/summaryview.c:451
msgid "Score"
msgstr "Score"
@@ -15925,13 +15925,13 @@ msgstr ""
msgid "Hidden columns"
msgstr "Éléments masqués"
-#: src/prefs_folder_column.c:299 src/prefs_summaries.c:414
-#: src/prefs_summaries.c:588 src/prefs_summary_column.c:313
+#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
+#: src/prefs_summaries.c:590 src/prefs_summary_column.c:313
msgid "Displayed columns"
msgstr "Éléments affichés"
#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:425
-#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1031
+#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1032
msgid " Use default "
msgstr " Remise à zéro "
@@ -16118,7 +16118,7 @@ msgstr "Utiliser une police différente pour l'impression"
msgid "Message Printing"
msgstr "Impression d'un message"
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:763
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:773
#: src/prefs_themes.c:421
msgid "Display"
msgstr "Affichage"
@@ -16350,11 +16350,11 @@ msgstr "corps du message"
msgid "whole message"
msgstr "tout le message"
-#: src/prefs_matcher.c:393 src/summaryview.c:6434
+#: src/prefs_matcher.c:393 src/summaryview.c:6478
msgid "Marked"
msgstr "Marqué"
-#: src/prefs_matcher.c:394 src/summaryview.c:6432
+#: src/prefs_matcher.c:394 src/summaryview.c:6476
msgid "Deleted"
msgstr "Supprimé"
@@ -16362,11 +16362,11 @@ msgstr "Supprimé"
msgid "Replied"
msgstr "Répondu"
-#: src/prefs_matcher.c:396 src/summaryview.c:6426
+#: src/prefs_matcher.c:396 src/summaryview.c:6470
msgid "Forwarded"
msgstr "Transféré"
-#: src/prefs_matcher.c:398 src/summaryview.c:6416 src/toolbar.c:515
+#: src/prefs_matcher.c:398 src/summaryview.c:6460 src/toolbar.c:515
#: src/toolbar.c:988 src/toolbar.c:2339
msgid "Spam"
msgstr "Pourriel"
@@ -16375,7 +16375,7 @@ msgstr "Pourriel"
msgid "Has attachment"
msgstr "Contient une ou plusieurs pièces jointes"
-#: src/prefs_matcher.c:400 src/summaryview.c:6452
+#: src/prefs_matcher.c:400 src/summaryview.c:6496
msgid "Signed"
msgstr "Signé"
@@ -16832,7 +16832,7 @@ msgctxt "Tooltip"
msgid "Pick color for signatures"
msgstr "Sélection de la couleur des signatures"
-#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:363
+#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:365
msgid "Folder list"
msgstr "Liste des dossiers"
@@ -16964,7 +16964,7 @@ msgstr "En quittant"
#: src/prefs_other.c:498
msgid "Confirm on exit"
-msgstr "Demander confirmation"
+msgstr "Confirmer avant de quitter"
#: src/prefs_other.c:505
msgid "Empty trash on exit"
@@ -17026,7 +17026,7 @@ msgstr "Délai d'attente maximal de communication"
#: src/prefs_other.c:579
msgid "Ask before emptying trash"
-msgstr "Demander une confirmation pour vider la ou les corbeilles"
+msgstr "Confirmer avant de vider la ou les corbeilles"
#: src/prefs_other.c:581
msgid "Ask about account specific filtering rules when filtering manually"
@@ -17175,8 +17175,7 @@ msgstr "Ne jamais envoyer d'accusé de réception"
#: src/prefs_send.c:197
msgid "Confirm before sending queued messages"
-msgstr ""
-"Demander une confirmation avant d'envoyer les messages en file d'attente"
+msgstr "Confirmer avant d'envoyer les messages en file d'attente"
#: src/prefs_send.c:200
msgid "Show send dialog"
@@ -17187,7 +17186,7 @@ msgid "Warn when Subject is empty"
msgstr "Prévenir si le sujet est vide."
#: src/prefs_send.c:209
-msgid "Warn when sending to more recipients than:"
+msgid "Warn when sending to more recipients than"
msgstr "Prévenir quand le nombre de destinataires dépasse"
#: src/prefs_send.c:225
@@ -17393,189 +17392,189 @@ msgstr ""
msgid "Spell Checking"
msgstr "Correcteur orthographique"
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:161
msgid "the abbreviated weekday name"
msgstr "nom abrégé du jour de la semaine"
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:162
msgid "the full weekday name"
msgstr "nom du jour de la semaine"
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:163
msgid "the abbreviated month name"
msgstr "nom du mois abrégé"
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:164
msgid "the full month name"
msgstr "nom du mois"
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:165
msgid "the preferred date and time for the current locale"
msgstr "le format par défaut de la date et de l'heure"
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:166
msgid "the century number (year/100)"
msgstr "le 'siècle' (année/100)"
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:167
msgid "the day of the month as a decimal number"
msgstr "le jour du mois"
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:168
msgid "the hour as a decimal number using a 24-hour clock"
msgstr "l'heure en tant que nombre (0-23)"
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:169
msgid "the hour as a decimal number using a 12-hour clock"
msgstr "l'heure en tant que nombre (1-12)"
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:170
msgid "the day of the year as a decimal number"
msgstr "le jour de l'année en tant que nombre"
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:171
msgid "the month as a decimal number"
msgstr "le mois en tant que nombre"
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:172
msgid "the minute as a decimal number"
msgstr "les minutes en tant que nombre"
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:173
msgid "either AM or PM"
msgstr "AM (matin) ou PM (après-midi)"
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:174
msgid "the second as a decimal number"
msgstr "les secondes en tant que nombre"
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:175
msgid "the day of the week as a decimal number"
msgstr "le jour de la semaine en tant que nombre"
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:176
msgid "the preferred date for the current locale"
msgstr "le format par défaut de la date"
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:177
msgid "the last two digits of a year"
msgstr "les deux derniers chiffres de l'année"
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:178
msgid "the year as a decimal number"
msgstr "l'année"
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:179
msgid "the time zone or name or abbreviation"
msgstr "le fuseau horaire, son nom ou abréviation"
-#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
-#: src/prefs_summaries.c:563
+#: src/prefs_summaries.c:200 src/prefs_summaries.c:248
+#: src/prefs_summaries.c:565
msgid "Date format"
msgstr "Format de la date"
-#: src/prefs_summaries.c:223
+#: src/prefs_summaries.c:224
msgid "Specifier"
msgstr "Symbole"
-#: src/prefs_summaries.c:265
+#: src/prefs_summaries.c:266
msgid "Example"
msgstr "Exemple"
-#: src/prefs_summaries.c:369
+#: src/prefs_summaries.c:371
msgid "Display message count next to folder name"
msgstr "Afficher le nombre de messages près du nom de dossier"
-#: src/prefs_summaries.c:379
+#: src/prefs_summaries.c:381
msgid "Unread messages"
msgstr "Messages non lus"
-#: src/prefs_summaries.c:380
+#: src/prefs_summaries.c:382
msgid "Unread and Total messages"
msgstr "Messages non lus et total"
-#: src/prefs_summaries.c:390
+#: src/prefs_summaries.c:392
msgid "Open last opened folder at start-up"
msgstr "Ouvrir au démarrage le dernier dossier consulté"
-#: src/prefs_summaries.c:393
+#: src/prefs_summaries.c:395
msgid "Abbreviate newsgroup names longer than"
msgstr "Abréger les noms des groupes de discussion de plus de"
-#: src/prefs_summaries.c:406
+#: src/prefs_summaries.c:408
msgid "letters"
msgstr "lettres"
-#: src/prefs_summaries.c:424
+#: src/prefs_summaries.c:426
msgid "Message list"
msgstr "Liste des messages"
-#: src/prefs_summaries.c:430
+#: src/prefs_summaries.c:432
msgid "Sort new folders by"
msgstr "Trier les nouveaux dossiers"
-#: src/prefs_summaries.c:438 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:440 src/prefs_summary_column.c:85
msgid "Number"
msgstr "Numéro"
-#: src/prefs_summaries.c:441
+#: src/prefs_summaries.c:443
msgid "Thread date"
msgstr "Par date de fil"
-#: src/prefs_summaries.c:452
+#: src/prefs_summaries.c:454
msgid "Don't sort"
msgstr "Ne pas trier"
-#: src/prefs_summaries.c:469
+#: src/prefs_summaries.c:471
msgid "Set default selection when entering a folder"
msgstr "Configurer la sélection par défaut à l'ouverture d'un dossier"
-#: src/prefs_summaries.c:482
+#: src/prefs_summaries.c:484
msgid "Show \"no unread (or new) message\" dialog"
msgstr "Affichage de la fenêtre « Plus de message non lu (ou nouveau) »"
-#: src/prefs_summaries.c:492
+#: src/prefs_summaries.c:494
msgid "Assume 'Yes'"
msgstr "Supposer « Oui »"
-#: src/prefs_summaries.c:493
+#: src/prefs_summaries.c:495
msgid "Assume 'No'"
msgstr "Supposer « Non »"
-#: src/prefs_summaries.c:498
+#: src/prefs_summaries.c:500
msgid "Open message when selected"
msgstr "Ouvrir les messages lorsqu'ils sont sélectionnés"
-#: src/prefs_summaries.c:503
+#: src/prefs_summaries.c:505
msgid "When opening a folder"
msgstr "À l'ouverture d'un dossier"
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:507
msgid "When displaying search results"
msgstr "Lors de l'affichage des résultats de la recherche"
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:509
msgid "When selecting next or previous message using shortcuts"
msgstr ""
"Lors de la sélection du message précédent ou suivant avec les raccourcis"
-#: src/prefs_summaries.c:509
+#: src/prefs_summaries.c:511
msgid "When deleting or moving messages"
msgstr "À la suppression ou au déplacement de messages"
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:513
msgid "When using directional keys"
msgstr "Lors de l'utilisation des touches de direction"
-#: src/prefs_summaries.c:515
+#: src/prefs_summaries.c:517
msgid "Thread using subject in addition to standard headers"
msgstr "Utiliser aussi le sujet pour la création des fils de discussion"
-#: src/prefs_summaries.c:519
+#: src/prefs_summaries.c:521
msgid "Execute immediately when moving or deleting messages"
msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
-#: src/prefs_summaries.c:521
+#: src/prefs_summaries.c:523
msgid ""
"Defers moving, copying and deleting of messages until you choose 'Tools/"
"Execute'"
@@ -17583,42 +17582,46 @@ msgstr ""
"Permet (si désactivé) de retarder le déplacement, la copie et la suppression "
"de messages jusqu'à la sélection de 'Outils/Exécuter'."
-#: src/prefs_summaries.c:524
+#: src/prefs_summaries.c:526
msgid "Mark message as read"
msgstr "Marquer le message comme lu"
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:529
msgid "when selected, after"
msgstr "quand sélectionné, après"
-#: src/prefs_summaries.c:546
+#: src/prefs_summaries.c:548
msgid "only when opened in a new window, or replied to"
msgstr ""
"seulement quand il est ouvert dans une nouvelle fenêtre, ou en y répondant"
-#: src/prefs_summaries.c:553
+#: src/prefs_summaries.c:555
msgid "Display sender using address book"
msgstr "Afficher le nom de l'expéditeur en utilisant le carnet d'adresses"
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:559
msgid "Show tooltips"
msgstr "Afficher les bulles d'aide"
-#: src/prefs_summaries.c:582
+#: src/prefs_summaries.c:584
msgid "Date format help"
msgstr "Symboles pour formater la date"
-#: src/prefs_summaries.c:600
+#: src/prefs_summaries.c:602
msgid "Confirm before marking all messages in a folder as read or unread"
msgstr ""
"Confirmer avant de marquer tous les messages d'un dossier comme lus ou non "
"lus"
-#: src/prefs_summaries.c:603
+#: src/prefs_summaries.c:605
+msgid "Confirm before overriding color label of messages"
+msgstr "Confirmer avant de remplacer la couleur des messages"
+
+#: src/prefs_summaries.c:608
msgid "Translate header names"
msgstr "Traduire les en-têtes"
-#: src/prefs_summaries.c:605
+#: src/prefs_summaries.c:610
msgid ""
"The display of standard headers (such as 'From:', 'Subject:') will be "
"translated into your language."
@@ -17626,7 +17629,7 @@ msgstr ""
"L'affichage des en-têtes courants (comme « From: », « Subject: ») sera "
"traduit dans le language présentement utilisé."
-#: src/prefs_summaries.c:764
+#: src/prefs_summaries.c:774
msgid "Summaries"
msgstr "Liste des messages"
@@ -17993,67 +17996,67 @@ msgstr "L'élément n'a pas d'icône définie."
msgid "Item has no text defined."
msgstr "L'élément n'a pas de texte défini."
-#: src/prefs_toolbar.c:895
+#: src/prefs_toolbar.c:896
msgid "Toolbar item"
msgstr "Élément de barre d'outils"
-#: src/prefs_toolbar.c:911
+#: src/prefs_toolbar.c:912
msgid "Item type"
msgstr "Type d'élément"
-#: src/prefs_toolbar.c:921
+#: src/prefs_toolbar.c:922
msgid "Internal Function"
msgstr "Fonction interne"
-#: src/prefs_toolbar.c:922
+#: src/prefs_toolbar.c:923
msgid "User Action"
msgstr "Action"
-#: src/prefs_toolbar.c:924 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:279
msgid "Separator"
msgstr "Séparateur"
-#: src/prefs_toolbar.c:931
+#: src/prefs_toolbar.c:932
msgid "Event executed on click"
msgstr "Fonction à exécuter"
-#: src/prefs_toolbar.c:958
+#: src/prefs_toolbar.c:959
msgid "Toolbar text"
msgstr "Texte de la barre d'outils"
-#: src/prefs_toolbar.c:973 src/prefs_toolbar.c:1350
+#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
msgid "Icon"
msgstr "Icône"
-#: src/prefs_toolbar.c:1009
+#: src/prefs_toolbar.c:1010
msgid "A_dd"
msgstr "A_jouter"
-#: src/prefs_toolbar.c:1229 src/prefs_toolbar.c:1243 src/prefs_toolbar.c:1257
+#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
msgid "Toolbars"
msgstr "Barre d'outils"
-#: src/prefs_toolbar.c:1230
+#: src/prefs_toolbar.c:1231
msgid "Main Window"
msgstr "Vue principale"
-#: src/prefs_toolbar.c:1244
+#: src/prefs_toolbar.c:1245
msgid "Message Window"
msgstr "Vue de messages"
-#: src/prefs_toolbar.c:1258
+#: src/prefs_toolbar.c:1259
msgid "Compose Window"
msgstr "Fenêtre de composition"
-#: src/prefs_toolbar.c:1373
+#: src/prefs_toolbar.c:1374
msgid "Icon text"
msgstr "Texte"
-#: src/prefs_toolbar.c:1382
+#: src/prefs_toolbar.c:1383
msgid "Mapped event"
msgstr "Fonction"
-#: src/prefs_toolbar.c:1689
+#: src/prefs_toolbar.c:1690
msgid "Toolbar item icon"
msgstr "Icône de l'élément de barre d'outils"
@@ -18122,28 +18125,28 @@ msgstr "Aucune d'information trouvée"
msgid "No recipient keys defined."
msgstr "Pas de clé de destinataire spécifiée."
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: src/procmime.c:435 src/procmime.c:437 src/procmime.c:438
msgid "[Error decoding BASE64]\n"
msgstr "[Erreur de décodage BASE64]\n"
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmsg.c:936 src/procmsg.c:939
msgid "Already trying to send."
msgstr "Les messages en file d'attente sont déjà en cours d'envoi."
-#: src/procmsg.c:1558 src/procmsg.c:1619
+#: src/procmsg.c:1557 src/procmsg.c:1618
#, c-format
msgid "Couldn't open file %s."
msgstr "Impossible d'ouvrir le fichier %s."
-#: src/procmsg.c:1629
+#: src/procmsg.c:1628
msgid "Queued message header is broken."
msgstr "L'en-tête de message en file d'attente est corrompue."
-#: src/procmsg.c:1649
+#: src/procmsg.c:1648
msgid "An error happened during SMTP session."
msgstr "Une erreur est survenue durant la session SMTP."
-#: src/procmsg.c:1663
+#: src/procmsg.c:1662
msgid ""
"No specific account has been found to send, and an error happened during "
"SMTP session."
@@ -18151,7 +18154,7 @@ msgstr ""
"Aucun compte précis n'a été trouvé pour l'envoi, et une erreur est survenue "
"durant la session SMTP."
-#: src/procmsg.c:1671
+#: src/procmsg.c:1670
msgid ""
"Couldn't determine sending information. Maybe the email hasn't been "
"generated by Claws Mail."
@@ -18159,22 +18162,22 @@ msgstr ""
"Impossible de déterminer les paramètres d'envoi. Le message n'a sans doute "
"pas été généré par Claws Mail."
-#: src/procmsg.c:1694
+#: src/procmsg.c:1693
msgid "Couldn't create temporary file for news sending."
msgstr "Impossible de créer un fichier temporaire pour l'envoi de l'article."
-#: src/procmsg.c:1707
+#: src/procmsg.c:1706
msgid "Error when writing temporary file for news sending."
msgstr ""
"Erreur pendant l'écriture du ficher temporaire nécessaire\n"
"à l'envoi de l'article."
-#: src/procmsg.c:1721
+#: src/procmsg.c:1720
#, c-format
msgid "Error occurred while posting the message to %s."
msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
-#: src/procmsg.c:2273
+#: src/procmsg.c:2272
msgid "Filtering messages...\n"
msgstr "Filtrage des messages..\n"
@@ -18864,61 +18867,61 @@ msgstr "De : %s, le %s"
msgid "To: %s, on %s"
msgstr "À : %s, le %s"
-#: src/summaryview.c:4423
-msgid "You're not the author of the article.\n"
-msgstr "Vous n'êtes pas l'auteur de cet article.\n"
+#: src/summaryview.c:4419
+msgid "You're not the author of the article."
+msgstr "Vous n'êtes pas l'auteur de cet article."
-#: src/summaryview.c:4513
+#: src/summaryview.c:4509
#, c-format
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the %d selected messages?"
msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
msgstr[1] "Voulez-vous vraiment supprimer les %d messages sélectionnés ?"
-#: src/summaryview.c:4516
+#: src/summaryview.c:4512
msgid "Delete message"
msgid_plural "Delete messages"
msgstr[0] "Supprimer le message"
msgstr[1] "Supprimer le(s) message(s) sélectionné(s)"
-#: src/summaryview.c:4680
+#: src/summaryview.c:4676
msgid "Destination is same as current folder."
msgstr "La destination est identique au dossier actuel."
-#: src/summaryview.c:4735
+#: src/summaryview.c:4731
msgid "Select folder to move selected message to"
msgid_plural "Select folder to move selected messages to"
msgstr[0] "Sélection du dossier où déplacer le message sélectionné"
msgstr[1] "Sélection du dossier où déplacer les messages sélectionnés"
-#: src/summaryview.c:4786
+#: src/summaryview.c:4782
msgid "Destination to copy is same as current folder."
msgstr "La destination et la source de la copie sont identiques"
-#: src/summaryview.c:4820
+#: src/summaryview.c:4816
msgid "Select folder to copy selected message to"
msgid_plural "Select folder to copy selected messages to"
msgstr[0] "Sélection du dossier où copier le message sélectionné"
msgstr[1] "Sélection du dossier où copier les messages sélectionnés"
-#: src/summaryview.c:4971
+#: src/summaryview.c:4967
msgid "Append or Overwrite"
msgstr "Ajouter ou écraser"
-#: src/summaryview.c:4972
+#: src/summaryview.c:4968
msgid "Append or overwrite existing file?"
msgstr ""
"Le fichier existe déjà. Ajouter au fichier existant ou bien l'écraser ?"
-#: src/summaryview.c:4973
+#: src/summaryview.c:4969
msgid "_Append"
msgstr "_Ajouter"
-#: src/summaryview.c:4973
+#: src/summaryview.c:4969
msgid "_Overwrite"
msgstr "_Écraser"
-#: src/summaryview.c:5014
+#: src/summaryview.c:5010
#, c-format
msgid ""
"You are about to print %d messages, one by one. Do you want to continue?"
@@ -18926,29 +18929,29 @@ msgstr ""
"Vous êtes sur le point d'imprimer %d messages un par un. Voulez-vous "
"continuer ?"
-#: src/summaryview.c:5472
+#: src/summaryview.c:5468
msgid "Building threads..."
msgstr "Construction des threads.."
-#: src/summaryview.c:5720
+#: src/summaryview.c:5716
msgid "Skip these rules"
msgstr "Ignorer ces règles"
-#: src/summaryview.c:5723
+#: src/summaryview.c:5719
msgid "Apply these rules regardless of the account they belong to"
msgstr ""
"Appliquer ces règles sans se soucier des comptes auxquels elles sont "
"rattachées"
-#: src/summaryview.c:5726
+#: src/summaryview.c:5722
msgid "Apply these rules if they apply to the current account"
msgstr "Appliquer ces règles si elles s'appliquent au compte courant"
-#: src/summaryview.c:5755
+#: src/summaryview.c:5751
msgid "Filtering"
msgstr "Filtrage"
-#: src/summaryview.c:5756
+#: src/summaryview.c:5752
msgid ""
"There are some filtering rules that belong to an account.\n"
"Please choose what to do with these rules:"
@@ -18956,55 +18959,67 @@ msgstr ""
"Il y a des règles de filtrage rattachées à des comptes.\n"
"Veuillez sélectionner ce que vous voulez faire avec ces règles :"
-#: src/summaryview.c:5787
+#: src/summaryview.c:5783
msgid "Filtering..."
msgstr "Filtrage des messages.."
-#: src/summaryview.c:5866
+#: src/summaryview.c:5862
msgid "Processing configuration"
msgstr "Configuration du filtrage/traitement"
-#: src/summaryview.c:6412
+#: src/summaryview.c:6010
+msgid "Do you really want to reset the color label of all selected messages?"
+msgstr "Voulez-vous vraiment effacer la couleur des messages sélectionnés ?"
+
+#: src/summaryview.c:6012
+msgid "Do you really want to apply this color label to all selected messages?"
+msgstr "Voulez-vous vraiment remplacer la couleur des messages sélectionnés ?"
+
+#: src/summaryview.c:6013
+msgid "Set color label"
+msgstr "Couleur"
+
+#: src/summaryview.c:6456
msgid "Ignored thread"
msgstr "Fil de discussion ignoré"
-#: src/summaryview.c:6414
+#: src/summaryview.c:6458
msgid "Watched thread"
msgstr "Fil de discussion suivi"
-#: src/summaryview.c:6422
+#: src/summaryview.c:6466
msgid "Replied but also forwarded - click to see reply"
msgstr "Répondu mais aussi transféré - cliquer pour voir la réponse"
-#: src/summaryview.c:6424
+#: src/summaryview.c:6468
msgid "Replied - click to see reply"
msgstr "Répondu - cliquer pour voir la réponse"
-#: src/summaryview.c:6436
+#: src/summaryview.c:6480
msgid "To be moved"
msgstr "À deplacer"
-#: src/summaryview.c:6438
+#: src/summaryview.c:6482
msgid "To be copied"
msgstr "À copier"
-#: src/summaryview.c:6450
+#: src/summaryview.c:6494
msgid "Signed, has attachment(s)"
msgstr "Signé et contenant une ou plusieurs pièces jointes"
-#: src/summaryview.c:6454
+#: src/summaryview.c:6498
msgid "Encrypted, has attachment(s)"
msgstr "Chiffré et contenant une ou plusieurs pièces jointes"
-#: src/summaryview.c:6456
+#: src/summaryview.c:6500
msgid "Encrypted"
msgstr "Chiffré"
-#: src/summaryview.c:6458
+#: src/summaryview.c:6502
msgid "Has attachment(s)"
msgstr "Contient une ou plusieurs pièces jointes"
-#: src/summaryview.c:8129
+#: src/summaryview.c:8173
#, c-format
msgid ""
"Regular expression (regexp) error:\n"
@@ -19013,11 +19028,11 @@ msgstr ""
"Erreur dans l'expression régulière (regexp) :\n"
"%s"
-#: src/summaryview.c:8232
+#: src/summaryview.c:8276
msgid "Go back to the folder list (You have unread messages)"
msgstr "Revenir à la liste des dossiers (vous avez des messages non lus)"
-#: src/summaryview.c:8237
+#: src/summaryview.c:8281
msgid "Go back to the folder list"
msgstr "Revenir à la liste des dossiers"
commit 3d4be15e38344b893cc95816d408fc16d85ef213
Author: wwp <wwp at free.fr>
Date: Fri May 25 09:55:34 2018 +0200
Fix missing initializers, taking for reference GLib 2.28 (with support
for up to 2.56) and Python 2.4 (with support for up to 3.6).
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
index 97d7293..9861da9 100644
--- a/src/addrcustomattr.c
+++ b/src/addrcustomattr.c
@@ -212,7 +212,7 @@ static void custom_attr_popup_factory_defaults (void *obj, void *data)
static GtkActionEntry custom_attr_popup_entries[] =
{
- {"CustomAttrPopup", NULL, "CustomAttrPopup" },
+ {"CustomAttrPopup", NULL, "CustomAttrPopup", NULL, NULL, NULL },
{"CustomAttrPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(custom_attr_popup_delete) },
{"CustomAttrPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(custom_attr_popup_clear_list) },
{"CustomAttrPopup/Reset", NULL, N_("_Reset to default"), NULL, NULL, G_CALLBACK(custom_attr_popup_factory_defaults) },
diff --git a/src/addressbook.c b/src/addressbook.c
index 943b9ba..c05871e 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -399,12 +399,12 @@ static void about_show_cb(GtkAction *action, gpointer data)
static GtkActionEntry addressbook_entries[] =
{
- {"Menu", NULL, "Menu" },
+ {"Menu", NULL, "Menu", NULL, NULL, NULL },
/* menus */
- {"Book", NULL, N_("_Book") },
- {"Address", NULL, N_("_Edit") },
- {"Tools", NULL, N_("_Tools") },
- {"Help", NULL, N_("_Help") },
+ {"Book", NULL, N_("_Book"), NULL, NULL, NULL },
+ {"Address", NULL, N_("_Edit"), NULL, NULL, NULL },
+ {"Tools", NULL, N_("_Tools"), NULL, NULL, NULL },
+ {"Help", NULL, N_("_Help"), NULL, NULL, NULL },
/* Book menu */
{"Book/NewBook", NULL, N_("New _Book"), "<control>B", NULL, G_CALLBACK(addressbook_new_book_cb) },
@@ -461,7 +461,7 @@ static GtkActionEntry addressbook_entries[] =
static GtkActionEntry addressbook_tree_popup_entries[] =
{
- {"ABTreePopup", NULL, "ABTreePopup" },
+ {"ABTreePopup", NULL, "ABTreePopup", NULL, NULL, NULL },
{"ABTreePopup/EditBook", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK(addressbook_treenode_edit_cb) },
{"ABTreePopup/DeleteBook", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(addressbook_treenode_delete_cb) },
{"ABTreePopup/---", NULL, "---", NULL, NULL, NULL },
@@ -476,7 +476,7 @@ static GtkActionEntry addressbook_tree_popup_entries[] =
static GtkActionEntry addressbook_list_popup_entries[] =
{
- {"ABListPopup", NULL, "ABListPopup" },
+ {"ABListPopup", NULL, "ABListPopup", NULL, NULL, NULL },
{"ABListPopup/SelectAll", NULL, N_("_Select all"), NULL, NULL, G_CALLBACK(addressbook_select_all_cb) },
{"ABListPopup/---", NULL, "---", NULL, NULL, NULL },
{"ABListPopup/Edit", NULL, N_("_Edit"), NULL, NULL, G_CALLBACK(addressbook_edit_address_cb) },
diff --git a/src/common/socket.c b/src/common/socket.c
index b363f76..f401f28 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -146,6 +146,8 @@ GSourceFuncs ssl_watch_funcs = {
ssl_sock_prepare,
ssl_sock_check,
ssl_sock_dispatch,
+ NULL,
+ NULL,
NULL
};
#endif
diff --git a/src/editaddress.c b/src/editaddress.c
index 921fadb..12095f4 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -985,7 +985,7 @@ static void addressbook_edit_person_unset_picture_menu_cb (GtkAction *action, gp
static GtkWidget *editaddr_popup_menu = NULL;
static GtkActionEntry editaddr_popup_entries[] =
{
- {"EditAddressPopup", NULL, "EditAddressPopup" },
+ {"EditAddressPopup", NULL, "EditAddressPopup", NULL, NULL, NULL },
{"EditAddressPopup/SetPicture", NULL, N_("_Set picture"), NULL, NULL, G_CALLBACK(addressbook_edit_person_set_picture_menu_cb) },
{"EditAddressPopup/UnsetPicture", NULL, N_("_Unset picture"), NULL, NULL, G_CALLBACK(addressbook_edit_person_unset_picture_menu_cb) },
};
diff --git a/src/edittags.c b/src/edittags.c
index 8f2bac2..0032dc3 100644
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -281,7 +281,7 @@ static void apply_popup_delete_all (GtkAction *action, gpointer data)
static GtkActionEntry apply_popup_actions[] =
{
- { "EditTags", NULL, "EditTags" },
+ { "EditTags", NULL, "EditTags", NULL, NULL, NULL },
{ "EditTags/Delete", NULL, N_("_Delete"), NULL, "Delete tag", G_CALLBACK(apply_popup_delete) },
{ "EditTags/DeleteAll", NULL, N_("Delete _all"), NULL, "Delete all tags", G_CALLBACK(apply_popup_delete_all) }
};
diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c
index 83ff3ee..07c80ab 100644
--- a/src/gtk/gtkcmclist.c
+++ b/src/gtk/gtkcmclist.c
@@ -506,6 +506,8 @@ gtk_cmclist_get_type (void)
sizeof (GtkCMCList),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_cmclist_init,
+
+ (const GTypeValueTable *) NULL /* value table */
};
clist_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkCMCList", &clist_info, (GTypeFlags)0);
}
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
index f620d87..7ddf8f8 100644
--- a/src/gtk/gtkcmctree.c
+++ b/src/gtk/gtkcmctree.c
@@ -361,6 +361,8 @@ gtk_cmctree_get_type (void)
sizeof (GtkCMCTree),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_cmctree_init,
+
+ (const GTypeValueTable *) NULL /* value table */
};
ctree_type = g_type_register_static (GTK_TYPE_CMCLIST, "GtkCMCTree", &ctree_info, (GTypeFlags)0);
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index e8d767f..ec50818 100644
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -144,6 +144,8 @@ gtk_sctree_get_type (void)
sizeof (GtkSCTree),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_sctree_init,
+
+ (const GTypeValueTable *) NULL /* value table */
};
sctree_type = g_type_register_static (GTK_TYPE_CMCTREE, "GtkSCTree", &sctree_info, (GTypeFlags)0);
diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c
index 3df2b5c..d33797e 100644
--- a/src/gtk/gtkvscrollbutton.c
+++ b/src/gtk/gtkvscrollbutton.c
@@ -102,6 +102,8 @@ GType gtk_vscrollbutton_get_type(void)
sizeof (GtkVScrollbutton),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_vscrollbutton_init,
+
+ (const GTypeValueTable *) NULL /* value table */
};
vscrollbutton_type = g_type_register_static (GTK_TYPE_VBOX, "GtkVScrollbutton", &vscrollbutton_info, (GTypeFlags)0);
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index e545554..4461a8a 100644
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -72,7 +72,7 @@ static GtkActionEntry imap_popup_entries[] =
{"FolderViewPopup/DownloadMessages", NULL, N_("Down_load messages"), NULL, NULL, G_CALLBACK(download_cb) },
- {"FolderViewPopup/Subscriptions", NULL, N_("S_ubscriptions") },
+ {"FolderViewPopup/Subscriptions", NULL, N_("S_ubscriptions"), NULL, NULL, NULL },
{"FolderViewPopup/Subscriptions/---", NULL, "---", NULL, NULL, NULL },
{"FolderViewPopup/Subscriptions/Subscribe", NULL, N_("_Subscribe..."), NULL, NULL, G_CALLBACK(subscribe_cb) },
{"FolderViewPopup/Subscriptions/Unsubscribe", NULL, N_("_Unsubscribe..."), NULL, NULL, G_CALLBACK(unsubscribe_cb) },
@@ -84,7 +84,7 @@ static GtkActionEntry imap_popup_entries[] =
static GtkToggleActionEntry imap_toggle_popup_entries[] =
{
- {"FolderViewPopup/Subscriptions/ShowOnlySubs", NULL, N_("Show only subscribed _folders"), NULL, NULL, G_CALLBACK(subscribed_cb) },
+ {"FolderViewPopup/Subscriptions/ShowOnlySubs", NULL, N_("Show only subscribed _folders"), NULL, NULL, G_CALLBACK(subscribed_cb), FALSE },
};
static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item);
diff --git a/src/mimeview.c b/src/mimeview.c
index 902833a..258b5e2 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -188,7 +188,7 @@ static void mimeview_select_prev_part_cb(GtkAction *action, gpointer data)
}
static GtkActionEntry mimeview_menu_actions[] = {
- { "MimeView", NULL, "MimeView" },
+ { "MimeView", NULL, "MimeView", NULL, NULL, NULL },
{ "MimeView/Open", NULL, N_("_Open"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
#if (!defined G_OS_WIN32)
{ "MimeView/OpenWith", NULL, N_("Open _with..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) },
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index ad4cf8f..65e6778 100644
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -66,7 +66,7 @@ static PrefParam prefs[] = {
NULL, NULL},
{"win_height", "-1", &AttRemoverData.win_height, P_INT, NULL,
NULL, NULL},
- {0,0,0,0}
+ {0,0,0,0,0,0,0}
};
enum {
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index b44934a..99d935c 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -92,7 +92,7 @@ static PrefParam param[] = {
{"proxy_server", "http://SERVERNAME:PORT", &fancy_prefs.proxy_str, P_STRING,
NULL, NULL, NULL},
{"stylesheet", "", &fancy_prefs.stylesheet, P_STRING, NULL, NULL, NULL},
- {0,0,0,0}
+ {0,0,0,0,0,0,0}
};
static FancyPrefsPage fancy_prefs_page;
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index f7793ad..3b03136 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -76,10 +76,10 @@ static SearchInterface search_interface = {
static GtkActionEntry sieve_editor_entries[] =
{
- {"Menu", NULL, "Menu" },
+ {"Menu", NULL, "Menu", NULL, NULL, NULL },
/* menus */
- {"Filter", NULL, N_("_Filter") },
- {"Edit", NULL, N_("_Edit") },
+ {"Filter", NULL, N_("_Filter"), NULL, NULL, NULL },
+ {"Edit", NULL, N_("_Edit"), NULL, NULL, NULL },
/* Filter menu */
{"Filter/Save", NULL, N_("_Save"), "<control>S", NULL, G_CALLBACK(sieve_editor_save_cb) },
@@ -90,7 +90,7 @@ static GtkActionEntry sieve_editor_entries[] =
/* Edit menu */
{"Edit/Undo", NULL, N_("_Undo"), "<control>Z", NULL, G_CALLBACK(sieve_editor_undo_cb) },
{"Edit/Redo", NULL, N_("_Redo"), "<control>Y", NULL, G_CALLBACK(sieve_editor_redo_cb) },
- /* {"Edit/---", NULL, "---" }, */
+ /* {"Edit/---", NULL, "---", NULL, NULL, NULL }, */
{"Edit/Cut", NULL, N_("Cu_t"), "<control>X", NULL, G_CALLBACK(sieve_editor_cut_cb) },
{"Edit/Copy", NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(sieve_editor_copy_cb) },
@@ -98,7 +98,7 @@ static GtkActionEntry sieve_editor_entries[] =
{"Edit/SelectAll", NULL, N_("Select _all"), "<control>A", NULL, G_CALLBACK(sieve_editor_allsel_cb) },
- {"Edit/---", NULL, "---" },
+ {"Edit/---", NULL, "---", NULL, NULL, NULL },
{"Edit/Find", NULL, N_("_Find"), "<control>F", NULL, G_CALLBACK(sieve_editor_find_cb) },
};
diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c
index a26057e..bbacb31 100644
--- a/src/plugins/managesieve/sieve_prefs.c
+++ b/src/plugins/managesieve/sieve_prefs.c
@@ -49,7 +49,7 @@ static PrefParam prefs[] = {
P_INT, NULL, NULL, NULL},
{"manager_win_height", "-1", &sieve_config.manager_win_height,
P_INT, NULL, NULL, NULL},
- {0,0,0,0}
+ {0,0,0,0,0,0,0}
};
#define PACK_HBOX(hbox, vbox) \
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
index f091aea..ee5aacd 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
@@ -641,7 +641,8 @@ gtk_hotkey_info_get_type (void)
NULL,
sizeof (GtkHotkeyInfo),
0,
- (GInstanceInitFunc) gtk_hotkey_info_init
+ (GInstanceInitFunc) gtk_hotkey_info_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_info_type_id = g_type_register_static (G_TYPE_OBJECT,
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
index 1a63e0d..fd4ce16 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
@@ -501,7 +501,8 @@ gtk_hotkey_key_file_registry_get_type (void)
NULL,
sizeof (GtkHotkeyKeyFileRegistry),
0,
- (GInstanceInitFunc) gtk_hotkey_key_file_registry_init
+ (GInstanceInitFunc) gtk_hotkey_key_file_registry_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_key_file_registry_type_id = g_type_register_static (GTK_HOTKEY_TYPE_STORAGE, "GtkHotkeyKeyFileRegistry", &g_define_type_info, 0);
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c
index 2fedb91..2a08692 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c
@@ -200,7 +200,8 @@ gtk_hotkey_listener_get_type (void)
NULL,
sizeof (GtkHotkeyListener),
0,
- (GInstanceInitFunc) gtk_hotkey_listener_init
+ (GInstanceInitFunc) gtk_hotkey_listener_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_listener_type_id = g_type_register_static (G_TYPE_OBJECT,
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c
index 35bde56..150fcb9 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c
@@ -332,7 +332,8 @@ gtk_hotkey_registry_get_type (void)
NULL,
sizeof (GtkHotkeyRegistry),
0,
- (GInstanceInitFunc) gtk_hotkey_registry_init
+ (GInstanceInitFunc) gtk_hotkey_registry_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_registry_type_id = g_type_register_static (G_TYPE_OBJECT, "GtkHotkeyRegistry", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
index 02bf334..22b850d 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
@@ -231,7 +231,8 @@ gtk_hotkey_x11_listener_get_type (void)
NULL,
sizeof (GtkHotkeyX11Listener),
0,
- (GInstanceInitFunc) gtk_hotkey_x11_listener_init
+ (GInstanceInitFunc) gtk_hotkey_x11_listener_init,
+ (const GTypeValueTable *) NULL /* value table */
};
gtk_hotkey_x11_listener_type_id = g_type_register_static (GTK_HOTKEY_TYPE_LISTENER, "GtkHotkeyX11Listener", &g_define_type_info, 0);
diff --git a/src/plugins/notification/notification_banner.c b/src/plugins/notification/notification_banner.c
index c71cdbc..436207b 100644
--- a/src/plugins/notification/notification_banner.c
+++ b/src/plugins/notification/notification_banner.c
@@ -93,7 +93,7 @@ G_LOCK_DEFINE_STATIC(sdata);
static GtkActionEntry banner_popup_entries[] =
{
- {"BannerPopup", NULL, "BannerPopup" },
+ {"BannerPopup", NULL, "BannerPopup", NULL, NULL, NULL },
{"BannerPopup/Reply", NULL, N_("_Reply"), NULL, NULL, G_CALLBACK(banner_menu_reply_cb) },
};
diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c
index 0c37e41..e93c7ad 100644
--- a/src/plugins/notification/notification_trayicon.c
+++ b/src/plugins/notification/notification_trayicon.c
@@ -117,10 +117,10 @@ static GtkWidget *traymenu_popup;
static GtkWidget *focused_widget = NULL;
static GtkActionEntry trayicon_popup_menu_entries[] = {
- {"SysTrayiconPopup", NULL, "SysTrayiconPopup" },
+ {"SysTrayiconPopup", NULL, "SysTrayiconPopup", NULL, NULL, NULL },
{"SysTrayiconPopup/GetMail", NULL, N_("_Get Mail"), NULL, NULL, G_CALLBACK(trayicon_get_all_cb) },
{"SysTrayiconPopup/GetMailAcc", NULL, N_("_Get Mail from account"), NULL, NULL, NULL },
- {"SysTrayiconPopup/---", NULL, "---" },
+ {"SysTrayiconPopup/---", NULL, "---", NULL, NULL, NULL },
{"SysTrayiconPopup/Email", NULL, N_("_Email"), NULL, NULL, G_CALLBACK(trayicon_compose_cb) },
{"SysTrayiconPopup/EmailAcc", NULL, N_("E_mail from account"), NULL, NULL, NULL },
{"SysTrayiconPopup/OpenAB", NULL, N_("Open A_ddressbook"), NULL, NULL, G_CALLBACK(trayicon_addressbook_cb) },
@@ -129,9 +129,9 @@ static GtkActionEntry trayicon_popup_menu_entries[] = {
static GtkToggleActionEntry trayicon_popup_toggle_menu_entries[] =
{
- {"SysTrayiconPopup/ToggleOffline", NULL, N_("_Work Offline"), NULL, NULL, G_CALLBACK(trayicon_toggle_offline_cb) },
+ {"SysTrayiconPopup/ToggleOffline", NULL, N_("_Work Offline"), NULL, NULL, G_CALLBACK(trayicon_toggle_offline_cb), FALSE },
#ifdef HAVE_LIBNOTIFY
- {"SysTrayiconPopup/ShowBubbles", NULL, N_("Show Trayicon Notifications"), NULL, NULL, G_CALLBACK(trayicon_toggle_notify_cb) },
+ {"SysTrayiconPopup/ShowBubbles", NULL, N_("Show Trayicon Notifications"), NULL, NULL, G_CALLBACK(trayicon_toggle_notify_cb), FALSE },
#endif
};
diff --git a/src/plugins/python/accounttype.c b/src/plugins/python/accounttype.c
index e5cbe32..63588c2 100644
--- a/src/plugins/python/accounttype.c
+++ b/src/plugins/python/accounttype.c
@@ -133,9 +133,23 @@ static PyTypeObject clawsmail_AccountType = {
(initproc)Account_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
-
gboolean cmpy_add_account(PyObject *module)
{
clawsmail_AccountType.tp_new = PyType_GenericNew;
diff --git a/src/plugins/python/composewindowtype.c b/src/plugins/python/composewindowtype.c
index 5c54641..822cc7f 100644
--- a/src/plugins/python/composewindowtype.c
+++ b/src/plugins/python/composewindowtype.c
@@ -712,6 +712,21 @@ static PyTypeObject clawsmail_ComposeWindowType = {
(initproc)ComposeWindow_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
gboolean cmpy_add_composewindow(PyObject *module)
diff --git a/src/plugins/python/folderpropertiestype.c b/src/plugins/python/folderpropertiestype.c
index 0eed08b..c5fcd30 100644
--- a/src/plugins/python/folderpropertiestype.c
+++ b/src/plugins/python/folderpropertiestype.c
@@ -101,9 +101,23 @@ static PyTypeObject clawsmail_FolderPropertiesType = {
(initproc)FolderProperties_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
-
gboolean cmpy_add_folderproperties(PyObject *module)
{
clawsmail_FolderPropertiesType.tp_new = PyType_GenericNew;
diff --git a/src/plugins/python/foldertype.c b/src/plugins/python/foldertype.c
index c11c701..ae27f8f 100644
--- a/src/plugins/python/foldertype.c
+++ b/src/plugins/python/foldertype.c
@@ -367,6 +367,21 @@ static PyTypeObject clawsmail_FolderType = {
(initproc)Folder_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
gboolean cmpy_add_folder(PyObject *module)
diff --git a/src/plugins/python/mailboxtype.c b/src/plugins/python/mailboxtype.c
index a7493ca..aa4be0e 100644
--- a/src/plugins/python/mailboxtype.c
+++ b/src/plugins/python/mailboxtype.c
@@ -106,9 +106,23 @@ static PyTypeObject clawsmail_MailboxType = {
(initproc)Mailbox_init, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
-
gboolean cmpy_add_mailbox(PyObject *module)
{
clawsmail_MailboxType.tp_new = PyType_GenericNew;
diff --git a/src/plugins/python/messageinfotype.c b/src/plugins/python/messageinfotype.c
index 2d20a3e..62794af 100644
--- a/src/plugins/python/messageinfotype.c
+++ b/src/plugins/python/messageinfotype.c
@@ -467,6 +467,21 @@ static PyTypeObject clawsmail_MessageInfoType = {
(initproc)MessageInfo_init,/* tp_init */
0, /* tp_alloc */
0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
+ 0, /* tp_del */
+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || \
+ (PY_MAJOR_VERSION == 3))
+ 0, /* tp_version_tag */
+#endif
+#if (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4)
+ 0, /* tp_finalize */
+#endif
};
gboolean cmpy_add_messageinfo(PyObject *module)
diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index dc8b1d6..14646f1 100644
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -355,7 +355,7 @@ static void create_compose_menus_and_items(GSList *filenames)
}
static GtkActionEntry compose_tools_python_actions[] = {
- {"Tools/PythonScripts", NULL, N_("Python scripts") },
+ {"Tools/PythonScripts", NULL, N_("Python scripts"), NULL, NULL, NULL },
};
static void ComposeActionData_destroy_cb(gpointer data)
@@ -499,12 +499,12 @@ static GtkToggleActionEntry mainwindow_tools_python_toggle[] = {
};
static GtkActionEntry mainwindow_tools_python_actions[] = {
- {"Tools/PythonScripts", NULL, N_("Python scripts") },
- {"Tools/PythonScripts/Refresh", NULL, N_("Refresh"),
+ {"Tools/PythonScripts", NULL, N_("Python scripts"), NULL, NULL, NULL },
+ {"Tools/PythonScripts/Refresh", NULL, N_("Refresh"), NULL, NULL, NULL,
NULL, NULL, G_CALLBACK(refresh_python_scripts_menus) },
{"Tools/PythonScripts/Browse", NULL, N_("Browse"),
NULL, NULL, G_CALLBACK(browse_python_scripts_dir) },
- {"Tools/PythonScripts/---", NULL, "---" },
+ {"Tools/PythonScripts/---", NULL, "---", NULL, NULL, NULL },
};
static int python_menu_init(char **error)
diff --git a/src/plugins/vcalendar/common-views.c b/src/plugins/vcalendar/common-views.c
index 4d569bc..6b42428 100644
--- a/src/plugins/vcalendar/common-views.c
+++ b/src/plugins/vcalendar/common-views.c
@@ -58,7 +58,7 @@ static void view_go_today_cb (GtkAction *action,
static GtkActionEntry view_event_popup_entries[] =
{
- {"VcalViewEvent", NULL, "VcalViewEvent" },
+ {"VcalViewEvent", NULL, "VcalViewEvent", NULL, NULL, NULL },
{"VcalViewEvent/EditMeeting", NULL, N_("_Edit this meeting..."), NULL, NULL, G_CALLBACK(view_edit_meeting_cb) },
{"VcalViewEvent/CancelMeeting", NULL, N_("_Cancel this meeting..."), NULL, NULL, G_CALLBACK(view_cancel_meeting_cb) },
{"VcalViewEvent/---", NULL, "---", NULL, NULL, NULL },
diff --git a/src/plugins/vcalendar/vcal_dbus.c b/src/plugins/vcalendar/vcal_dbus.c
index f6269ed..cc9c725 100644
--- a/src/plugins/vcalendar/vcal_dbus.c
+++ b/src/plugins/vcalendar/vcal_dbus.c
@@ -129,6 +129,7 @@ static const GDBusInterfaceVTable interface_vtable =
{
handle_method_call,
NULL,
+ NULL,
NULL
};
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 2fb31fa..515bf26 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1079,7 +1079,7 @@ static GtkWidget *prefs_actions_popup_menu = NULL;
static GtkActionEntry prefs_actions_popup_entries[] =
{
- {"PrefsActionsPopup", NULL, "PrefsActionsPopup" },
+ {"PrefsActionsPopup", NULL, "PrefsActionsPopup", NULL, NULL, NULL },
{"PrefsActionsPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_actions_delete_cb) },
{"PrefsActionsPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_actions_delete_all_cb) },
{"PrefsActionsPopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_actions_duplicate_cb) },
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index f77f953..943d238 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -1694,7 +1694,7 @@ static GtkWidget *prefs_filtering_popup_menu = NULL;
static GtkActionEntry prefs_filtering_popup_entries[] =
{
- {"PrefsFilteringPopup", NULL, "PrefsFilteringPopup" },
+ {"PrefsFilteringPopup", NULL, "PrefsFilteringPopup", NULL, NULL, NULL },
{"PrefsFilteringPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_filtering_delete_cb) },
{"PrefsFilteringPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_filtering_delete_all_cb) },
{"PrefsFilteringPopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_filtering_duplicate_cb) },
diff --git a/src/prefs_template.c b/src/prefs_template.c
index 832dd26..036db2f 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -1106,7 +1106,7 @@ static GtkWidget *prefs_template_popup_menu = NULL;
static GtkActionEntry prefs_template_popup_entries[] =
{
- {"PrefsTemplatePopup", NULL, "PrefsTemplatePopup" },
+ {"PrefsTemplatePopup", NULL, "PrefsTemplatePopup", NULL, NULL, NULL },
{"PrefsTemplatePopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_template_delete_cb) },
{"PrefsTemplatePopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_template_delete_all_cb) },
{"PrefsTemplatePopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_template_duplicate_cb) },
diff --git a/src/textview.c b/src/textview.c
index f0f54a7..5ce0bac 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -241,14 +241,14 @@ static void textview_show_tags(TextView *textview);
static GtkActionEntry textview_link_popup_entries[] =
{
- {"TextviewPopupLink", NULL, "TextviewPopupLink" },
+ {"TextviewPopupLink", NULL, "TextviewPopupLink", NULL, NULL, NULL },
{"TextviewPopupLink/Open", NULL, N_("_Open in web browser"), NULL, NULL, G_CALLBACK(open_uri_cb) },
{"TextviewPopupLink/Copy", NULL, N_("Copy this _link"), NULL, NULL, G_CALLBACK(copy_uri_cb) },
};
static GtkActionEntry textview_mail_popup_entries[] =
{
- {"TextviewPopupMail", NULL, "TextviewPopupMail" },
+ {"TextviewPopupMail", NULL, "TextviewPopupMail", NULL, NULL, NULL },
{"TextviewPopupMail/Compose", NULL, N_("Compose _new message"), NULL, NULL, G_CALLBACK(mail_to_uri_cb) },
{"TextviewPopupMail/ReplyTo", NULL, N_("_Reply to this address"), NULL, NULL, G_CALLBACK(reply_to_uri_cb) },
{"TextviewPopupMail/AddAB", NULL, N_("Add to _Address book"), NULL, NULL, G_CALLBACK(add_uri_to_addrbook_cb) },
@@ -257,7 +257,7 @@ static GtkActionEntry textview_mail_popup_entries[] =
static GtkActionEntry textview_file_popup_entries[] =
{
- {"TextviewPopupFile", NULL, "TextviewPopupFile" },
+ {"TextviewPopupFile", NULL, "TextviewPopupFile", NULL, NULL, NULL },
{"TextviewPopupFile/Open", NULL, N_("_Open image"), NULL, NULL, G_CALLBACK(open_image_cb) },
{"TextviewPopupFile/Save", NULL, N_("_Save image..."), NULL, NULL, G_CALLBACK(save_file_cb) },
};
commit 53710532cd14d746fcfc42956b8512e390cdb63d
Author: wwp <wwp at free.fr>
Date: Thu May 24 17:39:03 2018 +0200
Since we depend on GLib 2.28, make real use of GList/GSList's _free_full
functions. Remove unused list freeing functions.
diff --git a/src/common/utils.c b/src/common/utils.c
index 6bb2d6f..5172982 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -134,32 +134,14 @@ GSList *slist_copy_deep(GSList *list, GCopyFunc func)
#endif
}
-void list_free_strings(GList *list)
+void list_free_strings_full(GList *list)
{
- list = g_list_first(list);
-
- while (list != NULL) {
- g_free(list->data);
- list = list->next;
- }
-}
-
-void slist_free_strings(GSList *list)
-{
- while (list != NULL) {
- g_free(list->data);
- list = list->next;
- }
+ g_list_free_full(list, (GDestroyNotify)g_free);
}
void slist_free_strings_full(GSList *list)
{
-#if GLIB_CHECK_VERSION(2,28,0)
g_slist_free_full(list, (GDestroyNotify)g_free);
-#else
- g_slist_foreach(list, (GFunc)g_free, NULL);
- g_slist_free(list);
-#endif
}
static void hash_free_strings_func(gpointer key, gpointer value, gpointer data)
diff --git a/src/common/utils.h b/src/common/utils.h
index c904874..b3c088c 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -278,8 +278,7 @@ GSList *slist_copy_deep (GSList *list,
/* String utilities. */
-void list_free_strings (GList *list);
-void slist_free_strings (GSList *list);
+void list_free_strings_full (GList *list);
void slist_free_strings_full (GSList *list);
void hash_free_strings (GHashTable *table);
diff --git a/src/compose.c b/src/compose.c
index 54fdd60..a58f487 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -11568,10 +11568,10 @@ static void compose_attach_drag_received_cb (GtkWidget *widget,
utf8_filename, NULL, NULL);
g_free(utf8_filename);
}
- if (list) compose_changed_cb(NULL, compose);
- list_free_strings(list);
- g_list_free(list);
- } else if (gtk_drag_get_source_widget(context)
+ if (list)
+ compose_changed_cb(NULL, compose);
+ list_free_strings_full(list);
+ } else if (gtk_drag_get_source_widget(context)
== summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
/* comes from our summaryview */
SummaryView * summaryview = NULL;
@@ -11699,21 +11699,18 @@ static void compose_insert_drag_received_cb (GtkWidget *widget,
if (val == G_ALERTDEFAULT || val == G_ALERTCANCEL) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
- list_free_strings(list);
- g_list_free(list);
+ list_free_strings_full(list);
return;
} else if (val == G_ALERTOTHER) {
compose_attach_drag_received_cb(widget, drag_context, x, y, data, info, time, user_data);
- list_free_strings(list);
- g_list_free(list);
+ list_free_strings_full(list);
return;
}
for (tmp = list; tmp != NULL; tmp = tmp->next) {
compose_insert_file(compose, (const gchar *)tmp->data);
}
- list_free_strings(list);
- g_list_free(list);
+ list_free_strings_full(list);
gtk_drag_finish(drag_context, TRUE, FALSE, time);
return;
}
diff --git a/src/folderview.c b/src/folderview.c
index 7e64cd5..0b3d0aa 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -3132,10 +3132,9 @@ void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context,
g_slist_free(msglist);
gtk_drag_finish(drag_context, TRUE, FALSE, time);
} else {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
}
- list_free_strings(list);
- g_list_free(list);
+ list_free_strings_full(list);
}
static void folderview_drag_received_cb(GtkWidget *widget,
diff --git a/src/main.c b/src/main.c
index c9590a7..22baeb4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1585,8 +1585,7 @@ int main(int argc, char *argv[])
open_compose_new(cmd.compose_mailto, cmd.attach_files);
}
if (cmd.attach_files) {
- list_free_strings(cmd.attach_files);
- g_list_free(cmd.attach_files);
+ list_free_strings_full(cmd.attach_files);
cmd.attach_files = NULL;
}
if (cmd.subscribe) {
diff --git a/src/messageview.c b/src/messageview.c
index 95d851f..558ab6b 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1195,11 +1195,9 @@ static void messageview_register_nav(MessageView *messageview)
if (end->prev) {
end->prev->next = NULL;
end->prev = NULL;
- list_free_strings(end);
- g_list_free(end);
+ list_free_strings_full(end);
} else {
- list_free_strings(messageview->trail);
- g_list_free(messageview->trail);
+ list_free_strings_full(messageview->trail);
messageview->trail = NULL;
}
}
@@ -1656,8 +1654,7 @@ void messageview_destroy(MessageView *messageview)
g_free(messageview->toolbar);
}
- list_free_strings(messageview->trail);
- g_list_free(messageview->trail);
+ list_free_strings_full(messageview->trail);
msgview_list = g_list_remove(msgview_list, messageview);
if (messageview->window)
diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 1c987bd..d4217a1 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -1531,8 +1531,7 @@ gchar* get_item_event_list_for_date(FolderItem *item, EventTime date)
strcpy(result+e_len+2, (gchar *)cur->data);
}
}
- slist_free_strings(strs);
- g_slist_free(strs);
+ slist_free_strings_full(strs);
return result;
}
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index a202bce..4e9e094 100644
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -1431,8 +1431,7 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
gtk_combo_box_set_active(GTK_COMBO_BOX(meet->end_time), -1);
combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(meet->end_time), times);
- list_free_strings(times);
- g_list_free(times);
+ list_free_strings_full(times);
meet->location = gtk_entry_new();
meet->summary = gtk_entry_new();
commit df53ae275f7ae14629198cc2a7e3881fcdf39be9
Author: Paul <paul at claws-mail.org>
Date: Wed May 23 18:28:55 2018 +0100
update UI copyright year
diff --git a/src/gtk/about.c b/src/gtk/about.c
index 38933db..e406e97 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2018 Hiroyuki Yamamoto 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
@@ -160,7 +160,7 @@ static GtkWidget *about_create_child_page_info(void)
NULL);
#ifdef GENERIC_UMPC
ADD_TEXT("\n\n");
- ADD_TEXT(_("Copyright (C) 1999-2017\nThe Claws Mail Team\n"
+ ADD_TEXT(_("Copyright (C) 1999-2018\nThe Claws Mail Team\n"
"and Hiroyuki Yamamoto"));
#endif
ADD_TEXT("\n\n");
@@ -854,7 +854,7 @@ static void about_create(void)
gtk_container_add(GTK_CONTAINER(grid2), button);
#ifndef GENERIC_UMPC
label = gtk_label_new
- (_("Copyright (C) 1999-2017\nThe Claws Mail Team\n"
+ (_("Copyright (C) 1999-2018\nThe Claws Mail Team\n"
"and Hiroyuki Yamamoto"));
gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
commit 546b18b9f52a90237ceed87efd971b0b19b642cf
Author: Paul <paul at claws-mail.org>
Date: Wed May 23 18:10:46 2018 +0100
fix quoting in reply to format=flowed message
diff --git a/src/procmime.c b/src/procmime.c
index 2be4b12..76ee317 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -293,7 +293,8 @@ static int procmime_fclose(FILE *fp)
gint llen = 0; \
strretchomp(lastline); \
llen = strlen(lastline); \
- if (lastline[llen-1] == ' ' && strcmp(lastline,"-- ")) { \
+ if (lastline[llen-1] == ' ' && strcmp(lastline,"-- ") && \
+ strcmp(lastline,"> ")) { \
/* this is flowed */ \
if (delsp) \
lastline[llen-1] = '\0'; \
commit 2b22a38de42103e9434a050b0dedab4b7851af2e
Author: wwp <wwp at free.fr>
Date: Tue May 22 23:05:29 2018 +0200
Update app name in header cartouche and other places, correct
copyrights. Base patch by Abhay S. Kushwaha, with few additions
and slight changes.
diff --git a/src/common/template.c b/src/common/template.c
index 4c27d56..9e9e364 100644
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -1,7 +1,7 @@
/*
- * Sylpheed templates subsystem
+ * Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 2001-2018 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/common/template.h b/src/common/template.h
index 2a37806..d7cf422 100644
--- a/src/common/template.h
+++ b/src/common/template.h
@@ -1,7 +1,7 @@
/*
- * Sylpheed templates subsystem
+ * Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 2001-2018 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/exportldif.c b/src/exportldif.c
index c864975..d9c1b49 100644
--- a/src/exportldif.c
+++ b/src/exportldif.c
@@ -130,8 +130,8 @@ void exportldif_set_suffix( ExportLdifCtl *ctl, const char *value ) {
* \param ctl Export control data.
* \param value Index to variable, as follows:
* <ul>
- * <li><code>EXPORT_LDIF_ID_UID</code> - Use Sylpheed UID.</li>
- * <li><code>EXPORT_LDIF_ID_DNAME</code> - Use Sylpheed display name.</li>
+ * <li><code>EXPORT_LDIF_ID_UID</code> - Use Claws Mail UID.</li>
+ * <li><code>EXPORT_LDIF_ID_DNAME</code> - Use Claws Mail display name.</li>
* <li><code>EXPORT_LDIF_ID_EMAIL</code> - Use first Email address.</li>
* </ul>
*/
diff --git a/src/folder.h b/src/folder.h
index 69c0538..7013a7c 100644
--- a/src/folder.h
+++ b/src/folder.h
@@ -324,7 +324,7 @@ struct _FolderClass
XMLTag *(*item_get_xml) (Folder *folder,
FolderItem *item);
/**
- * Get a local path for the \c FolderItem where Sylpheed can save
+ * Get a local path for the \c FolderItem where Claws Mail can save
* it's cache data. For local directory based folders this can be the
* real path. For other folders it can be the local cache directory.
*
@@ -372,12 +372,9 @@ struct _FolderClass
* Close a \c FolderItem. Called when the user deselects a
* \c FolderItem.
*
- * \attention In Sylpheed-Main operations can only be done on the
- * \c FolderItem that is opened in the SummaryView. This
- * \c FolderItem will be closed when you select a new
- * \c FolderItem in the FolderView. In Claws operations can
- * be done any time on any folder and you should not expect
- * that all \c FolderItems get closed after operations
+ * \attention In Claws Mail, operations can be done any time on any
+ * folder and you should not expect that all
+ * \c FolderItems get closed after operations
*
* \param folder The \c Folder that contains the \c FolderItem
* \param item The \c FolderItem that should be closed
diff --git a/src/folderview.c b/src/folderview.c
index bd39efa..7e64cd5 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2290,8 +2290,8 @@ static void folderview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
can_select = FALSE;
/* Save cache for old folder */
- /* We don't want to lose all caches if sylpheed crashed */
- /* resets folderview->opened to NULL */
+ /* We don't want to lose all caches if app crashes */
+ /* Resets folderview->opened to NULL */
folderview_close_opened(folderview, FALSE);
/* CLAWS: set compose button type: news folder items
diff --git a/src/imap.c b/src/imap.c
index 8d0ded9..fce5ed9 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -5080,10 +5080,10 @@ static gboolean flag_ok(IMAPFolderItem *item, guint flag)
/*
* NEW and DELETED flags are not syncronized
* - The NEW/RECENT flags in IMAP folders can not really be directly
- * modified by Sylpheed
- * - The DELETE/DELETED flag in IMAP and Sylpheed don't have the same
+ * modified by Claws Mail
+ * - The DELETE/DELETED flag in IMAP and Claws Mail do not have the same
* meaning, in IMAP it always removes the messages from the FolderItem
- * in Sylpheed it can mean to move the message to trash
+ * in Claws Mail it can mean to move the message to Trash
*/
typedef struct _get_flags_data {
diff --git a/src/partial_download.c b/src/partial_download.c
index d59ae80..e0283cc 100644
--- a/src/partial_download.c
+++ b/src/partial_download.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Colin Leroy <colin at colino.net>
+ * Copyright (C) 1999-2018 Colin Leroy <colin at colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
@@ -34,11 +34,11 @@
* 2 (POP3_PARTIAL_DLOAD_DELE) meaning that the user does not want to finish
* downloading the mail
* When updating this header to POP3_PARTIAL_DLOAD_DLOAD, the uidl line of
- * this mail will end with the mail's physical path, which Sylpheed will remove
+ * this mail will end with the mail's physical path, which Claws Mail will remove
* after having downloaded the complete mail. msg->partial_recv will equal
* 2 (POP3_MUST_COMPLETE_RECV).
* When updating this header to POP3_PARTIAL_DLOAD_DELE, the uidl line of
- * this mail will be 0 (POP3_TOTALLY_RECEIVED), which will let Sylpheed delete
+ * this mail will be 0 (POP3_TOTALLY_RECEIVED), which will let Claws Mail delete
* this mail from the server as soon as the leave_time preference specifies.
*/
diff --git a/src/prefs_template.c b/src/prefs_template.c
index c95d95a..832dd26 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -1,7 +1,7 @@
/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2018 Hiroyuki Yamamoto and the Claws Mail team
- * Claws Mail templates subsystem Copyright (C) 2001 Alexander Barinov
+ * Claws Mail templates subsystem
+ * Copyright (C) 2001 Alexander Barinov
+ * Copyright (C) 2001-2013 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/prefs_template.h b/src/prefs_template.h
index 7d77c3e..c2d647e 100644
--- a/src/prefs_template.h
+++ b/src/prefs_template.h
@@ -1,7 +1,7 @@
/*
- * Sylpheed templates subsystem
+ * Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 2001-2018 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/prefs_toolbar.c b/src/prefs_toolbar.c
index 548e8a4..513e084 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -392,7 +392,7 @@ static void prefs_toolbar_populate(ToolbarPage *prefs_toolbar)
combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(prefs_toolbar->item_func_combo),
prefs_toolbar->combo_action_list);
- /* get currently defined sylpheed actions */
+ /* get currently defined actions */
if (prefs_common.actions_list != NULL) {
for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
act = (gchar *)cur->data;
commit c2d317f1155fd5e74b4cf5b9108f3239756d3746
Author: wwp <wwp at free.fr>
Date: Tue May 22 19:30:08 2018 +0200
Fix more unchecked return values reported by Coverity:
1434282, 1434283, 1434284
diff --git a/src/common/utils.c b/src/common/utils.c
index 8236e84..6bb2d6f 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3563,8 +3563,9 @@ static void _get_rfc822_date(gchar *buf, gint len, gboolean hidetz)
else
lt = localtime_r(&t, &buf1);
- sscanf(asctime_r(lt, buf2), "%3s %3s %d %d:%d:%d %d\n",
- day, mon, &dd, &hh, &mm, &ss, &yyyy);
+ if (sscanf(asctime_r(lt, buf2), "%3s %3s %d %d:%d:%d %d\n",
+ day, mon, &dd, &hh, &mm, &ss, &yyyy) != 7)
+ g_warning("failed reading date/time");
g_snprintf(buf, len, "%s, %d %s %d %02d:%02d:%02d %s",
day, dd, mon, yyyy, hh, mm, ss, (hidetz? "-0000": tzoffset(&t)));
diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c
index c005122..a26057e 100644
--- a/src/plugins/managesieve/sieve_prefs.c
+++ b/src/plugins/managesieve/sieve_prefs.c
@@ -507,9 +507,9 @@ struct SieveAccountConfig *sieve_prefs_account_get_config(
enc_userid[0] = '\0';
enc_passwd[0] = '\0';
#if defined(G_OS_WIN32) || defined(__OpenBSD__) || defined(__FreeBSD__)
- sscanf(confstr, "%c%c %255s %c%hu %hhu %hhu %hhu %255s %255s",
+ if (sscanf(confstr, "%c%c %255s %c%hu %hhu %hhu %hhu %255s %255s",
#else
- sscanf(confstr, "%c%c %ms %c%hu %hhu %hhu %hhu %255s %255s",
+ if (sscanf(confstr, "%c%c %ms %c%hu %hhu %hhu %hhu %255s %255s",
#endif
&enable, &use_host,
#if defined(G_OS_WIN32) || defined(__OpenBSD__) || defined(__FreeBSD__)
@@ -522,7 +522,8 @@ struct SieveAccountConfig *sieve_prefs_account_get_config(
&auth,
&auth_type,
enc_userid,
- enc_passwd);
+ enc_passwd) != 10)
+ g_warning("failed reading Sieve config elements");
/* Scan enums separately, for endian purposes */
config->tls_type = tls_type;
diff --git a/src/plugins/vcalendar/vcal_manager.c b/src/plugins/vcalendar/vcal_manager.c
index 260ad83..52bfd81 100644
--- a/src/plugins/vcalendar/vcal_manager.c
+++ b/src/plugins/vcalendar/vcal_manager.c
@@ -529,8 +529,9 @@ static void get_rfc822_date_from_time_t(gchar *buf, gint len, time_t t)
struct tm buft2;
lt = localtime_r(&t, &buft2);
- sscanf(asctime_r(lt, buft1), "%3s %3s %d %d:%d:%d %d\n",
- day, mon, &dd, &hh, &mm, &ss, &yyyy);
+ if (sscanf(asctime_r(lt, buft1), "%3s %3s %d %d:%d:%d %d\n",
+ day, mon, &dd, &hh, &mm, &ss, &yyyy) != 7)
+ g_warning("failed reading date/time");
g_snprintf(buf, len, "%s, %d %s %d %02d:%02d:%02d %s",
day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
#else
commit 2b5bf3d617f15cb25dc562fb1e2d895080fb6f3c
Author: wwp <wwp at free.fr>
Date: Tue May 22 19:12:36 2018 +0200
Fix few unchecked return values reported by Coverity:
1434187, 1434189, 1434192, 1434193, 1434195, 1434196, 1434198, 1434200, 1434202, 1434203
And few more. Change few silent returns into debug ones (cm_return_if_fail).
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 8ce1177..713fd50 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -1026,14 +1026,15 @@ static void addrcompl_add_entry( CompletionWindow *cw, gchar *address ) {
gtk_grab_add( cw->window );
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cw->list_view));
- gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
+ if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
+ return;
- if( cw->listCount == 1 ) {
+ if (cw->listCount == 1) {
/* Select first row for now */
gtk_tree_selection_select_iter(selection, &iter);
}
#ifndef GENERIC_UMPC
- else if( cw->listCount == 2 ) {
+ else if (cw->listCount == 2) {
if (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter)) {
/* Move off first row */
gtk_tree_selection_select_iter(selection, &iter);
@@ -1216,7 +1217,7 @@ static void completion_window_apply_selection(GtkTreeView *list_view,
GList *grp_emails = NULL;
selection = gtk_tree_view_get_selection(list_view);
- if (! gtk_tree_selection_get_selected(selection, &model, &iter))
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
/* First remove the idler */
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index 2c8bb0c..89f9af4 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -514,8 +514,7 @@ static gboolean is_editing_entry_only_selection(void)
return FALSE;
selected = gtk_tree_selection_get_selected_rows(sel_detail,&model);
- if(!selected)
- return FALSE;
+ cm_return_val_if_fail(selected, FALSE);
gtk_tree_model_get_iter(model, &iter, (GtkTreePath*)selected->data);
g_list_foreach(selected, (GFunc)gtk_tree_path_free, NULL);
@@ -786,9 +785,7 @@ static void cb_del_btn_clicked(GtkButton *button, gpointer data)
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(detail_view));
list = gtk_tree_selection_get_selected_rows(selection, &model);
-
- if(!list)
- return;
+ cm_return_if_fail(list);
aval = alertpanel(_("Delete address(es)"),
_("Really delete the address(es)?"),
diff --git a/src/compose.c b/src/compose.c
index 01f459d..54fdd60 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -9214,9 +9214,7 @@ static void compose_attach_remove_selected(GtkAction *action, gpointer data)
selection = gtk_tree_view_get_selection(tree_view);
sel = gtk_tree_selection_get_selected_rows(selection, &model);
-
- if (!sel)
- return;
+ cm_return_if_fail(sel);
for (cur = sel; cur != NULL; cur = cur->next) {
GtkTreePath *path = cur->data;
@@ -9277,8 +9275,7 @@ static void compose_attach_property(GtkAction *action, gpointer data)
return;
sel = gtk_tree_selection_get_selected_rows(selection, &model);
- if (!sel)
- return;
+ cm_return_if_fail(sel);
path = (GtkTreePath *) sel->data;
gtk_tree_model_get_iter(model, &iter, path);
diff --git a/src/gtk/combobox.c b/src/gtk/combobox.c
index 4804960..151edae 100644
--- a/src/gtk/combobox.c
+++ b/src/gtk/combobox.c
@@ -263,8 +263,9 @@ void combobox_set_sensitive(GtkComboBox *combobox, const guint index,
if((model = gtk_combo_box_get_model(combobox)) == NULL)
return;
-
- gtk_tree_model_get_iter_first(model, &iter);
+
+ if(gtk_tree_model_get_iter_first(model, &iter) == FALSE)
+ return;
for(i=0; i<index; i++) {
if(gtk_tree_model_iter_next(model, &iter) == FALSE)
return;
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index 8160235..df0c0c1 100644
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -89,7 +89,8 @@ static void set_selected(FolderSortDialog *dialog)
/* Get row number of the selected row */
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->folderlist));
- gtk_tree_selection_get_selected(sel, &model, &iter);
+ if (!gtk_tree_selection_get_selected(sel, &model, &iter))
+ return;
path = gtk_tree_model_get_path(model, &iter);
indices = gtk_tree_path_get_indices(path);
selected = indices[0];
@@ -115,7 +116,8 @@ static void moveup_clicked(GtkWidget *widget, FolderSortDialog *dialog)
/* Get currently selected iter */
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->folderlist));
- gtk_tree_selection_get_selected(sel, &model, &iter);
+ if (!gtk_tree_selection_get_selected(sel, &model, &iter))
+ return;
/* Now get the iter above it, if any */
#if GTK_CHECK_VERSION(3, 0, 0)
@@ -156,7 +158,8 @@ static void movedown_clicked(GtkWidget *widget, FolderSortDialog *dialog)
/* Get currently selected iter */
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->folderlist));
- gtk_tree_selection_get_selected(sel, &model, &iter);
+ if (!gtk_tree_selection_get_selected(sel, &model, &iter))
+ return;
/* Now get the iter above it, if any */
nextiter = iter;
diff --git a/src/mimeview.c b/src/mimeview.c
index 5b367de..902833a 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -663,7 +663,8 @@ gint mimeview_get_selected_part_num(MimeView *mimeview)
GtkTreePath *path;
gint i = 0;
- gtk_tree_model_get_iter_first(model, &iter);
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return -1;
path = gtk_tree_model_get_path(model, &iter);
do {
@@ -691,7 +692,8 @@ void mimeview_select_part_num(MimeView *mimeview, gint i)
if (i < 0)
return;
- gtk_tree_model_get_iter_first(model, &iter);
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return;
path = gtk_tree_model_get_path(model, &iter);
while (x != i) {
@@ -2364,7 +2366,8 @@ static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
GtkTreePath *path;
MimeInfo *curr = NULL;
- gtk_tree_model_get_iter_first(model, &iter);
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return;
path = gtk_tree_model_get_path(model, &iter);
do {
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
index a37fb54..4ef90f5 100644
--- a/src/prefs_folder_column.c
+++ b/src/prefs_folder_column.c
@@ -714,11 +714,11 @@ static FolderColumnType prefs_folder_column_get_column(GtkWidget *list, gint row
if (!gtk_tree_model_iter_nth_child(model, &iter, NULL, row))
return -1;
-
+
gtk_tree_model_get(model, &iter,
SUMCOL_TYPE, &result,
-1);
-
+
return result;
}
@@ -734,7 +734,7 @@ static GtkWidget *prefs_folder_column_list_view_create(const gchar *name)
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(list_view),
prefs_common.use_stripes_everywhere);
-
+
selector = gtk_tree_view_get_selection(GTK_TREE_VIEW(list_view));
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
@@ -745,12 +745,12 @@ static GtkWidget *prefs_folder_column_list_view_create(const gchar *name)
row_targets,
G_N_ELEMENTS(row_targets),
GDK_ACTION_MOVE);
-
+
gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(list_view),
row_targets,
G_N_ELEMENTS(row_targets),
GDK_ACTION_MOVE);
-
+
g_signal_connect(G_OBJECT(list_view), "drag_data_get",
G_CALLBACK(drag_data_get),
model);
@@ -810,50 +810,50 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
FolderColumnType type;
GtkTreeModel *sel_model;
gchar *name;
-
+
source = gtk_drag_get_source_widget(context);
-
+
if (source == GTK_WIDGET(tree_view)) {
/*
* Same widget: re-order
*/
- gtk_tree_selection_get_selected(gtk_tree_view_get_selection(tree_view),
- NULL, &isel);
- sel = gtk_tree_model_get_path(model, &isel);
- gtk_tree_view_get_dest_row_at_pos(tree_view, x, y,
- &dst, &pos);
-
- /* NOTE: dst is invalid if selection beyond last row, in that
- * case move beyond last one (XXX_move_before(..., NULL)) */
-
- if (dst)
- gtk_tree_model_get_iter(model, &idst, dst);
- else
- gtk_list_store_move_before(GTK_LIST_STORE(model),
- &isel,
- NULL);
-
- /* we do not drag if no valid dst and sel, and when
- * dst and sel are the same (moving after or before
- * itself doesn't change order...) */
- if ((dst && sel) && gtk_tree_path_compare(sel, dst) != 0) {
- if (pos == GTK_TREE_VIEW_DROP_BEFORE
- || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(tree_view),
+ NULL, &isel)) {
+ sel = gtk_tree_model_get_path(model, &isel);
+ gtk_tree_view_get_dest_row_at_pos(tree_view, x, y,
+ &dst, &pos);
+
+ /* NOTE: dst is invalid if selection beyond last row, in that
+ * case move beyond last one (XXX_move_before(..., NULL)) */
+
+ if (dst)
+ gtk_tree_model_get_iter(model, &idst, dst);
+ else
gtk_list_store_move_before(GTK_LIST_STORE(model),
&isel,
- &idst);
- else
- gtk_list_store_move_after(GTK_LIST_STORE(model),
- &isel,
- &idst);
-
- }
- gtk_tree_path_free(dst);
- gtk_tree_path_free(sel);
+ NULL);
+
+ /* we do not drag if no valid dst and sel, and when
+ * dst and sel are the same (moving after or before
+ * itself doesn't change order...) */
+ if ((dst && sel) && gtk_tree_path_compare(sel, dst) != 0) {
+ if (pos == GTK_TREE_VIEW_DROP_BEFORE
+ || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+ gtk_list_store_move_before(GTK_LIST_STORE(model),
+ &isel,
+ &idst);
+ else
+ gtk_list_store_move_after(GTK_LIST_STORE(model),
+ &isel,
+ &idst);
+ }
+ gtk_tree_path_free(dst);
+ gtk_tree_path_free(sel);
+ }
gtk_drag_finish(context, TRUE, FALSE, time);
-
+
} else if (source == folder_col.stock_list_view
|| source == folder_col.shown_list_view) {
@@ -861,47 +861,47 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
* Other widget: change and update
*/
-
/* get source information and remove */
- gtk_tree_selection_get_selected(gtk_tree_view_get_selection(
+ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(
GTK_TREE_VIEW(source)),
- &sel_model, &isel);
- type = *((gint *) gtk_selection_data_get_data(data));
- name = gettext(col_name[type]);
- gtk_list_store_remove(GTK_LIST_STORE(sel_model), &isel);
-
- /* get insertion position */
- gtk_tree_view_get_dest_row_at_pos(tree_view, x, y, &dst, &pos);
-
- /* NOTE: dst is invalid if insertion point beyond last row,
- * just append to list in that case (XXX_store_append()) */
-
- if (dst) {
- gtk_tree_model_get_iter(model, &idst, dst);
-
- if (pos == GTK_TREE_VIEW_DROP_BEFORE
- || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
- gtk_list_store_insert_before(GTK_LIST_STORE(model),
- &isel,
- &idst);
- else
- gtk_list_store_insert_after(GTK_LIST_STORE(model),
- &isel,
- &idst);
- } else
- gtk_list_store_append(GTK_LIST_STORE(model),
- &isel);
-
- gtk_list_store_set(GTK_LIST_STORE(model), &isel,
- SUMCOL_NAME, name,
- SUMCOL_TYPE, type, -1);
- gtk_tree_path_free(dst);
+ &sel_model, &isel)) {
+ type = *((gint *) gtk_selection_data_get_data(data));
+ name = gettext(col_name[type]);
+ gtk_list_store_remove(GTK_LIST_STORE(sel_model), &isel);
+
+ /* get insertion position */
+ gtk_tree_view_get_dest_row_at_pos(tree_view, x, y, &dst, &pos);
+
+ /* NOTE: dst is invalid if insertion point beyond last row,
+ * just append to list in that case (XXX_store_append()) */
+
+ if (dst) {
+ gtk_tree_model_get_iter(model, &idst, dst);
+
+ if (pos == GTK_TREE_VIEW_DROP_BEFORE
+ || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+ gtk_list_store_insert_before(GTK_LIST_STORE(model),
+ &isel,
+ &idst);
+ else
+ gtk_list_store_insert_after(GTK_LIST_STORE(model),
+ &isel,
+ &idst);
+ } else
+ gtk_list_store_append(GTK_LIST_STORE(model),
+ &isel);
+
+ gtk_list_store_set(GTK_LIST_STORE(model), &isel,
+ SUMCOL_NAME, name,
+ SUMCOL_TYPE, type, -1);
+ gtk_tree_path_free(dst);
+ }
gtk_drag_finish(context, TRUE, FALSE, time);
}
prefs_folder_column_shown_set_active(FALSE);
prefs_folder_column_stock_set_active(FALSE);
-
+
/* XXXX: should we call gtk_drag_finish() for other code paths? */
}
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index 39b6f80..fea0ac7 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -825,48 +825,48 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
SummaryColumnType type;
GtkTreeModel *sel_model;
gchar *name;
-
+
source = gtk_drag_get_source_widget(context);
-
+
if (source == GTK_WIDGET(tree_view)) {
/*
* Same widget: re-order
*/
-
- gtk_tree_selection_get_selected(gtk_tree_view_get_selection(tree_view),
- NULL, &isel);
- sel = gtk_tree_model_get_path(model, &isel);
- gtk_tree_view_get_dest_row_at_pos(tree_view, x, y,
- &dst, &pos);
-
- /* NOTE: dst is invalid if selection beyond last row, in that
- * case move beyond last one (XXX_move_before(..., NULL)) */
-
- if (dst)
- gtk_tree_model_get_iter(model, &idst, dst);
- else
- gtk_list_store_move_before(GTK_LIST_STORE(model),
- &isel,
- NULL);
-
- /* we do not drag if no valid dst and sel, and when
- * dst and sel are the same (moving after or before
- * itself doesn't change order...) */
- if ((dst && sel) && gtk_tree_path_compare(sel, dst) != 0) {
- if (pos == GTK_TREE_VIEW_DROP_BEFORE
- || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+
+ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(tree_view),
+ NULL, &isel)) {
+ sel = gtk_tree_model_get_path(model, &isel);
+ gtk_tree_view_get_dest_row_at_pos(tree_view, x, y,
+ &dst, &pos);
+
+ /* NOTE: dst is invalid if selection beyond last row, in that
+ * case move beyond last one (XXX_move_before(..., NULL)) */
+
+ if (dst)
+ gtk_tree_model_get_iter(model, &idst, dst);
+ else
gtk_list_store_move_before(GTK_LIST_STORE(model),
&isel,
- &idst);
- else
- gtk_list_store_move_after(GTK_LIST_STORE(model),
- &isel,
- &idst);
-
- }
- gtk_tree_path_free(dst);
- gtk_tree_path_free(sel);
+ NULL);
+
+ /* we do not drag if no valid dst and sel, and when
+ * dst and sel are the same (moving after or before
+ * itself doesn't change order...) */
+ if ((dst && sel) && gtk_tree_path_compare(sel, dst) != 0) {
+ if (pos == GTK_TREE_VIEW_DROP_BEFORE
+ || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+ gtk_list_store_move_before(GTK_LIST_STORE(model),
+ &isel,
+ &idst);
+ else
+ gtk_list_store_move_after(GTK_LIST_STORE(model),
+ &isel,
+ &idst);
+ }
+ gtk_tree_path_free(dst);
+ gtk_tree_path_free(sel);
+ }
gtk_drag_finish(context, TRUE, FALSE, time);
} else if (source == summary_col.stock_list_view
@@ -876,41 +876,41 @@ static void drag_data_received(GtkTreeView *tree_view, GdkDragContext *context,
* Other widget: change and update
*/
-
/* get source information and remove */
- gtk_tree_selection_get_selected(gtk_tree_view_get_selection(
+ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(
GTK_TREE_VIEW(source)),
- &sel_model, &isel);
- type = *((gint *) gtk_selection_data_get_data(data));
- name = gettext(col_name[type]);
- gtk_list_store_remove(GTK_LIST_STORE(sel_model), &isel);
-
- /* get insertion position */
- gtk_tree_view_get_dest_row_at_pos(tree_view, x, y, &dst, &pos);
-
- /* NOTE: dst is invalid if insertion point beyond last row,
- * just append to list in that case (XXX_store_append()) */
-
- if (dst) {
- gtk_tree_model_get_iter(model, &idst, dst);
-
- if (pos == GTK_TREE_VIEW_DROP_BEFORE
- || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
- gtk_list_store_insert_before(GTK_LIST_STORE(model),
- &isel,
- &idst);
- else
- gtk_list_store_insert_after(GTK_LIST_STORE(model),
- &isel,
- &idst);
- } else
- gtk_list_store_append(GTK_LIST_STORE(model),
- &isel);
-
- gtk_list_store_set(GTK_LIST_STORE(model), &isel,
- SUMCOL_NAME, name,
- SUMCOL_TYPE, type, -1);
- gtk_tree_path_free(dst);
+ &sel_model, &isel)) {
+ type = *((gint *) gtk_selection_data_get_data(data));
+ name = gettext(col_name[type]);
+ gtk_list_store_remove(GTK_LIST_STORE(sel_model), &isel);
+
+ /* get insertion position */
+ gtk_tree_view_get_dest_row_at_pos(tree_view, x, y, &dst, &pos);
+
+ /* NOTE: dst is invalid if insertion point beyond last row,
+ * just append to list in that case (XXX_store_append()) */
+
+ if (dst) {
+ gtk_tree_model_get_iter(model, &idst, dst);
+
+ if (pos == GTK_TREE_VIEW_DROP_BEFORE
+ || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)
+ gtk_list_store_insert_before(GTK_LIST_STORE(model),
+ &isel,
+ &idst);
+ else
+ gtk_list_store_insert_after(GTK_LIST_STORE(model),
+ &isel,
+ &idst);
+ } else
+ gtk_list_store_append(GTK_LIST_STORE(model),
+ &isel);
+
+ gtk_list_store_set(GTK_LIST_STORE(model), &isel,
+ SUMCOL_NAME, name,
+ SUMCOL_TYPE, type, -1);
+ gtk_tree_path_free(dst);
+ }
gtk_drag_finish(context, TRUE, FALSE, time);
}
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 03adca3..548e8a4 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -370,10 +370,11 @@ static void prefs_toolbar_set_displayed(ToolbarPage *prefs_toolbar)
}
/* select first */
- gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
- gtk_tree_selection_select_iter(gtk_tree_view_get_selection
- (list_view_set),
- &iter);
+ if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
+ gtk_tree_selection_select_iter(gtk_tree_view_get_selection
+ (list_view_set),
+ &iter);
+ }
}
static void add_item_to_plugin_combo(gpointer key, gpointer data, gpointer combo_box)
diff --git a/src/uri_opener.c b/src/uri_opener.c
index 2116327..fe855a7 100644
--- a/src/uri_opener.c
+++ b/src/uri_opener.c
@@ -301,7 +301,8 @@ static void uri_opener_load_uris (void)
g_object_unref(opener.urilist);
model = gtk_tree_view_get_model(GTK_TREE_VIEW(opener.urilist));
- gtk_tree_model_get_iter_first(model, &iter);
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(opener.urilist));
gtk_tree_selection_select_iter(selection, &iter);
}
@@ -362,8 +363,7 @@ static void uri_opener_open_cb(GtkWidget *widget,
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(opener.urilist));
selected = gtk_tree_selection_get_selected_rows(selection, &model);
- if(!selected)
- return;
+ cm_return_if_fail(selected);
for(cur = selected; cur != NULL; cur = g_list_next(cur))
{
commit 4bfea623b0e391cb1ebd709cc40466ec40db3f11
Author: Paul <paul at claws-mail.org>
Date: Tue May 22 11:21:58 2018 +0100
fix syntax error in man page
List syntax error. This means .IP, .TP or .RS/.RE markup is garbled.
Common causes include .TP just before a section header, .TP entries
with tags but no bodies, and mandoc lists with no trailing .El.
These confuse doclifter, and may also mess up stricter man-page
browsers like Xman and Rosetta.
Patch by Eric S. Raymond
diff --git a/AUTHORS b/AUTHORS
index 204841f..9bbc156 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -322,3 +322,4 @@ contributors (in addition to the above; based on Changelog)
Michael Gmelin
Ralph Sennhauser
Michael Schwendt
+ Eric S. Raymond
diff --git a/doc/man/claws-mail.1 b/doc/man/claws-mail.1
index 06d026a..4b3fa7e 100644
--- a/doc/man/claws-mail.1
+++ b/doc/man/claws-mail.1
@@ -252,15 +252,12 @@ User\-specified tag list.
$HOME/.claws\-mail/toolbar*.xml
User\-defined custom toolbars.
.TP
-.B "Windows only"
-.LP
-.TP
%TEMP%\\claws\-win32.log
-Claws Mail output file when \-\-debug is enabled. If %TEMP% is not set it
-defaults to windows directory (usually C:\\Windows) or C:\\ if windows
-directory is not available.
+(Windows only) Claws Mail output file when \-\-debug is enabled. If
+%TEMP% is not set it defaults to windows directory (usually
+C:\\Windows) or C:\\ if windows directory is not available.
.TP
-%APPDATA%\\Claws\-mail\\claws.log
+(Windows only) %APPDATA%\\Claws\-mail\\claws.log
Claws Mail log file.
.SH "EXAMPLES"
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index a093c42..360f514 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -256,6 +256,7 @@ static char *CONTRIBS_LIST[] = {
"Steve Rader",
"Jens Rantil",
"Ravemax",
+"Eric S. Raymond",
"Ivan Rayner",
"David Relson",
"Volker Ribbert",
commit 6c2d65635e407490dd2199f22d349e076c57fdaf
Author: Ricardo Mones <ricardo at mones.org>
Date: Thu May 17 00:19:24 2018 +0200
Remove another colon
diff --git a/src/prefs_send.c b/src/prefs_send.c
index ab3307e..0b9086e 100644
--- a/src/prefs_send.c
+++ b/src/prefs_send.c
@@ -206,7 +206,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_show (hbox1);
PACK_CHECK_BUTTON(hbox1, checkbtn_warn_multiple_recipients,
- _("Warn when sending to more recipients than:"));
+ _("Warn when sending to more recipients than"));
spinbtn_warn_multiple_recipients = gtk_spin_button_new_with_range(2, 999, 1);
gtk_widget_show(spinbtn_warn_multiple_recipients);
commit 41e94b1308998c18fd10e63a12ee4cf509f08e4a
Author: Ricardo Mones <ricardo at mones.org>
Date: Thu May 17 00:15:37 2018 +0200
Update lists of contributors
diff --git a/AUTHORS b/AUTHORS
index 752d83a..204841f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -321,3 +321,4 @@ contributors (in addition to the above; based on Changelog)
Olaf Hering
Michael Gmelin
Ralph Sennhauser
+ Michael Schwendt
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index c485273..a093c42 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -274,6 +274,7 @@ static char *CONTRIBS_LIST[] = {
"Simon 'corecode' Schubert",
"Kim Schulz",
"Markus Schwarzenberg",
+"Michael Schwendt",
"Ralph Sennhauser",
"Setoh",
"Michael Shell",
commit 6f872bed1eca27189bd864be39b190ae15f9b09d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Tue Mar 13 21:03:46 2018 +0100
Fix bug 3895: Port from libnm-util/libnm-glib to libnm
diff --git a/configure.ac b/configure.ac
index ab1c9bf..3a0eb5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -862,7 +862,7 @@ dnl # Check for NetworkManager support
dnl #######################################################################
if test x"$enable_dbus" = xyes; then
if test x"$enable_networkmanager" = xyes; then
- PKG_CHECK_MODULES(NETWORKMANAGER_SUPPORT, NetworkManager >= 0.6.2,
+ PKG_CHECK_MODULES(NETWORKMANAGER_SUPPORT, libnm,
[
AC_DEFINE(HAVE_NETWORKMANAGER_SUPPORT, 1, [Define if NetworkManager support is to be included.])
echo "Building with NetworkManager support"
diff --git a/src/main.c b/src/main.c
index bf3a31e..c9590a7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -152,9 +152,6 @@
static gboolean went_offline_nm;
#endif
-#if !defined(NM_CHECK_VERSION)
-#define NM_CHECK_VERSION(x,y,z) 0
-#endif
#ifdef HAVE_DBUS_GLIB
static DBusGProxy *awn_proxy = NULL;
@@ -1107,17 +1104,10 @@ int main(int argc, char *argv[])
"/org/freedesktop/NetworkManager",
"org.freedesktop.NetworkManager");
if (nm_proxy) {
-#if NM_CHECK_VERSION(0,8,992)
dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
G_CALLBACK(networkmanager_state_change_cb),
NULL,NULL);
-#else
- dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
- G_CALLBACK(networkmanager_state_change_cb),
- NULL,NULL);
-#endif
}
#endif
install_dbus_status_handler();
@@ -2989,14 +2979,9 @@ gboolean networkmanager_is_online(GError **error)
g_propagate_error(error, tmp_error);
return TRUE;
}
-#if NM_CHECK_VERSION(0,8,992)
return (state == NM_STATE_CONNECTED_LOCAL ||
state == NM_STATE_CONNECTED_SITE ||
state == NM_STATE_CONNECTED_GLOBAL ||
state == NM_STATE_UNKNOWN);
-#else
- return (state == NM_STATE_CONNECTED ||
- state == NM_STATE_UNKNOWN);
-#endif
}
#endif
commit 2d39c20a00b8eda9c888fb12df78790caea7bd78
Author: Paul <paul at claws-mail.org>
Date: Wed May 16 15:31:03 2018 +0100
when using hide_timezone, convert time to UTC
diff --git a/src/common/utils.c b/src/common/utils.c
index 941f1c7..8236e84 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3558,7 +3558,10 @@ static void _get_rfc822_date(gchar *buf, gint len, gboolean hidetz)
gchar buf2[RFC822_DATE_BUFFSIZE];
t = time(NULL);
- lt = localtime_r(&t, &buf1);
+ if (hidetz)
+ lt = gmtime_r(&t, &buf1);
+ else
+ lt = localtime_r(&t, &buf1);
sscanf(asctime_r(lt, buf2), "%3s %3s %d %d:%d:%d %d\n",
day, mon, &dd, &hh, &mm, &ss, &yyyy);
commit ca2819ebf75c4088ee6006d06e167257d15061c1
Author: Paul <paul at claws-mail.org>
Date: Tue May 15 11:40:52 2018 +0100
force explicit use of --disable-gnutls if gnutls support is not required
diff --git a/configure.ac b/configure.ac
index e93ac87..ab1c9bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -482,8 +482,10 @@ if test "x$enable_gnutls" != "xno"; then
])
],
[
- echo "Building without gnutls"
- enable_gnutls=no
+ echo "Building without GnuTLS"
+ AC_MSG_RESULT([*** GnuTLS support is recommended ])
+ AC_MSG_RESULT([*** You can use --disable-gnutls if you don't need it.])
+ AC_MSG_ERROR([GnuTLS not found])
])
AC_SUBST(GNUTLS_LIBS)
AC_SUBST(GNUTLS_CFLAGS)
commit cecaac4cc8f186f74836872f4693e6af27b41608
Author: Paul <paul at claws-mail.org>
Date: Tue May 15 09:59:20 2018 +0100
require nettle, following removal of libcrypt from glibc
based on the fedora patch, thanks!
diff --git a/configure.ac b/configure.ac
index 7a5cfb7..e93ac87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -489,22 +489,8 @@ if test "x$enable_gnutls" != "xno"; then
AC_SUBST(GNUTLS_CFLAGS)
fi
-dnl password encryption
-OLDLIBS=$LIBS
-LIBS=
-case $host_os in
- *dragonfly*)
- AC_SEARCH_LIBS(encrypt, cipher, [], AC_MSG_ERROR(['encrypt'-function not found.]))
- ;;
- freebsd*)
- ;; # not used
- *)
- AC_SEARCH_LIBS(encrypt, crypt, [], AC_MSG_ERROR(['encrypt'-function not found.]))
- ;;
-esac
-CRYPT_LIBS=$LIBS
-AC_SUBST(CRYPT_LIBS)
-LIBS=$OLDLIBS
+PKG_CHECK_MODULES(NETTLE, nettle)
+AC_SUBST(NETTLE_LIBS)
AC_ARG_WITH(passcrypt-key, [ --with-passcrypt-key=KEY Key used to encode passwords (8 byte string)],
with_passcrypt_key="$withval", with_passcrypt_key="passkey0")
diff --git a/src/Makefile.am b/src/Makefile.am
index 460c182..d2d1548 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -598,6 +598,7 @@ claws_mail_LDADD = \
$(GTK_LIBS) \
$(LDAP_LIBS) \
$(GNUTLS_LIBS) \
+ $(NETTLE_LIBS) \
$(COMPFACE_LIBS) \
$(JPILOT_LIBS) \
$(PTHREAD_LIBS) \
diff --git a/src/common/passcrypt.c b/src/common/passcrypt.c
index 7b125aa..5fceb73 100644
--- a/src/common/passcrypt.c
+++ b/src/common/passcrypt.c
@@ -29,6 +29,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
+#include <nettle/des.h>
#if defined (__FreeBSD__)
#include <rpc/des_crypt.h>
@@ -82,11 +83,10 @@ static void
crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
unsigned chunksize, int decrypt)
{
+ struct des_ctx ctx;
unsigned char temp[64];
- memcpy(temp, key, 8);
- crypt_unpack(temp);
- setkey((const char *) temp);
+ des_set_key(&ctx,(const uint8_t*) key);
memset(temp, 0, sizeof(temp));
memset(crypt_cfb_iv, 0, sizeof(crypt_cfb_iv));
@@ -96,7 +96,14 @@ crypt_cfb_buf(const char key[8], unsigned char *buf, unsigned len,
while (len) {
memcpy(temp, crypt_cfb_iv, sizeof(temp));
- encrypt((char *) temp, 0);
+ /* simulate encrypt() via Nettle */
+ char temp2[8];
+ memset(temp2,0,sizeof(temp2));
+ crypt_cfb_xor(temp2,temp,sizeof(temp)/sizeof(temp2));
+ des_encrypt(&ctx,sizeof(temp2),(uint8_t*)temp2,(uint8_t*)temp2);
+ memcpy(temp,temp2,sizeof(temp2));
+ crypt_unpack(temp);
+ /* */
if (chunksize > len)
chunksize = len;
if (decrypt)
commit 1332638639540280609610a0d2bee958431c57da
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Tue May 8 16:54:53 2018 +0200
Fix crash in quicksearch keypress handling.
The fourth argument to g_signal_emit_by_name() in this case
is not the signal user data, but a pointer where to store the
return value.
diff --git a/src/mainwindow.c b/src/mainwindow.c
index ed2abae..ce5c006 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1369,7 +1369,8 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
{
GtkWidget *entry =
quicksearch_get_entry(mainwin->summaryview->quicksearch);
- g_signal_emit_by_name(entry, "key-press-event", event, data);
+ gboolean dummy;
+ g_signal_emit_by_name(entry, "key-press-event", event, &dummy);
return TRUE;
}
commit 22cfb93341a7cc1bfe6f6c8b6889e3d86b4fe0bc
Author: wwp <wwp at free.fr>
Date: Tue May 8 08:54:16 2018 +0200
Force initialization of buffer (fixes a valgrind case where buf is
used uninitialized).
diff --git a/src/procmime.c b/src/procmime.c
index 44e546c..2be4b12 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -380,11 +380,12 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
tmp_file = TRUE;
readend = mimeinfo->offset + mimeinfo->length;
+ *buf = '\0';
if (encoding == ENC_QUOTED_PRINTABLE) {
while ((ftell(infp) < readend) && (SC_FGETS(buf, sizeof(buf), infp) != NULL)) {
gint len;
len = qp_decode_line(buf);
- buf[len]='\0';
+ buf[len] = '\0';
if (!flowed) {
if (SC_FWRITE(buf, 1, len, outfp) < len)
err = TRUE;
commit 143961d1c747a895e98a5faace67bd554312f8be
Author: wwp <wwp at free.fr>
Date: Mon May 7 19:00:50 2018 +0200
Fix a memory leak in quicksearch code.
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 289314b..3fb9587 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -139,19 +139,19 @@ static void quicksearch_add_to_history(QuickSearch* quicksearch)
if (advsearch_has_proper_predicate(quicksearch->asearch)) {
quicksearch->extended_search_strings =
add_history(quicksearch->extended_search_strings,
- g_strdup(search_string));
+ search_string);
prefs_common.summary_quicksearch_history =
add_history(prefs_common.summary_quicksearch_history,
- g_strdup(search_string));
+ search_string);
}
break;
default:
quicksearch->normal_search_strings =
add_history(quicksearch->normal_search_strings,
- g_strdup(search_string));
+ search_string);
prefs_common.summary_quicksearch_history =
add_history(prefs_common.summary_quicksearch_history,
- g_strdup(search_string));
+ search_string);
break;
}
commit 6ca7f54aa3126cc0a9e3ad4b7479f1d290e4ea0b
Author: wwp <wwp at free.fr>
Date: Mon May 7 13:11:26 2018 +0200
Fix wrong type for layout_mode var in struct.
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 82e1b54..cc9451c 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -381,7 +381,7 @@ struct _PrefsCommon
GList *addressbook_custom_attributes;
/* Interface */
- gboolean layout_mode;
+ LayoutType layout_mode;
gint statusbar_update_step;
gboolean emulate_emacs;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list