[Commits] [SCM] claws branch, master, updated. 3.16.0-173-g4627fc1
wwp at claws-mail.org
wwp at claws-mail.org
Tue May 22 23:08:02 CEST 2018
The branch, master has been updated
via 4627fc154f61b16e880e607c6ff0500c5ef02d77 (commit)
from 4eed7df3a7d38a2cced8397449a7367e98138ea9 (commit)
Summary of changes:
src/common/template.c | 4 ++--
src/common/template.h | 4 ++--
src/exportldif.c | 4 ++--
src/folder.h | 11 ++++-------
src/folderview.c | 4 ++--
src/imap.c | 6 +++---
src/partial_download.c | 6 +++---
src/prefs_template.c | 2 +-
src/prefs_template.h | 4 ++--
src/prefs_toolbar.c | 2 +-
10 files changed, 22 insertions(+), 25 deletions(-)
- Log -----------------------------------------------------------------
commit 4627fc154f61b16e880e607c6ff0500c5ef02d77
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 d807486..ae53b90 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2293,8 +2293,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 3b91b9b..7a0aa12 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -1,7 +1,7 @@
/*
* Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * 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 464012b..cc7e7f9 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;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list