[Commits] [SCM] claws branch, master, updated. 4.3.1-58-ge5678c635
wwp at claws-mail.org
wwp at claws-mail.org
Sun Mar 23 09:26:29 UTC 2025
The branch, master has been updated
via e5678c63501a4540c5c46403ac7cdaec91dd851c (commit)
from 6fbda0d3cacaae7473027089b43b775a8fa3f15c (commit)
Summary of changes:
src/plugins/archive/archiver_gtk.c | 10 ++++----
src/plugins/archive/libarchive_archive.c | 2 +-
src/plugins/clamd/clamav_plugin_gtk.c | 4 ++--
src/plugins/clamd/libclamd/clamd-plugin.c | 18 +++++++-------
src/plugins/gdata/cm_gdata_contacts.c | 18 +++++++-------
src/plugins/mailmbox/mailmbox_folder.c | 2 +-
src/plugins/notification/notification_core.c | 28 +++++++++++-----------
.../notification/notification_foldercheck.c | 5 ++--
src/plugins/notification/notification_hotkeys.c | 14 +++++------
src/plugins/notification/notification_indicator.c | 2 +-
src/plugins/notification/notification_lcdproc.c | 2 +-
src/plugins/notification/notification_popup.c | 26 ++++++++++----------
src/plugins/notification/notification_trayicon.c | 26 ++++++++++----------
src/plugins/perl/perl_plugin.c | 4 ++--
src/plugins/pgpcore/passphrase.c | 4 ++--
src/plugins/pgpcore/sgpgme.c | 4 ++--
src/plugins/python/clawsmailmodule.c | 4 ++--
src/plugins/python/composewindowtype.c | 6 ++---
src/plugins/python/foldertype.c | 4 ++--
src/plugins/python/python-hooks.c | 4 ++--
src/plugins/python/python_plugin.c | 18 +++++++-------
src/plugins/rssyl/old_feeds.c | 2 +-
src/plugins/rssyl/opml_export.c | 2 +-
src/plugins/rssyl/rssyl.c | 2 +-
src/plugins/rssyl/rssyl_feed_props.c | 2 +-
src/plugins/smime/smime.c | 2 +-
src/plugins/spamassassin/libspamc.c | 2 +-
27 files changed, 108 insertions(+), 109 deletions(-)
- Log -----------------------------------------------------------------
commit e5678c63501a4540c5c46403ac7cdaec91dd851c
Author: wwp <subscript at free.fr>
Date: Sun Mar 23 10:25:36 2025 +0100
Normalize capitalization in more messages.
diff --git a/src/plugins/archive/archiver_gtk.c b/src/plugins/archive/archiver_gtk.c
index 0a71cd4fb..e0bca32ae 100644
--- a/src/plugins/archive/archiver_gtk.c
+++ b/src/plugins/archive/archiver_gtk.c
@@ -557,19 +557,19 @@ static gboolean archiver_save_files(struct ArchivePage* page) {
if ((perm = file_is_writeable(page)) != A_FILE_OK) {
switch (perm) {
case A_FILE_EXISTS:
- msg = g_strdup_printf(_("%s: Exists. Continue anyway?"), page->name);
+ msg = g_strdup_printf(_("%s: exists. Continue anyway?"), page->name);
break;
case A_FILE_IS_LINK:
- msg = g_strdup_printf(_("%s: Is a link. Cannot continue"), page->name);
+ msg = g_strdup_printf(_("%s: is a link. Cannot continue"), page->name);
break;
case A_FILE_IS_DIR:
- msg = g_strdup_printf(_("%s: Is a directory. Cannot continue"), page->name);
+ msg = g_strdup_printf(_("%s: is a directory. Cannot continue"), page->name);
break;
case A_FILE_NO_WRITE:
- msg = g_strdup_printf(_("%s: Missing permissions. Cannot continue"), page->name);
+ msg = g_strdup_printf(_("%s: missing permissions. Cannot continue"), page->name);
break;
case A_FILE_UNKNOWN:
- msg = g_strdup_printf(_("%s: Unknown error. Cannot continue"), page->name);
+ msg = g_strdup_printf(_("%s: unknown error. Cannot continue"), page->name);
break;
default:
break;
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index c2416b356..e2aa05128 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -756,7 +756,7 @@ int main(int argc, char** argv) {
archive_scan_folder(*argv++);
res = archive_create(archive, file_list, GZIP, TAR);
if (res != NULL) {
- fprintf(stderr, "%s: Creating archive failed [%s]\n", archive, res);
+ fprintf(stderr, "%s: creating archive failed [%s]\n", archive, res);
return EXIT_FAILURE;
}
}
diff --git a/src/plugins/clamd/clamav_plugin_gtk.c b/src/plugins/clamd/clamav_plugin_gtk.c
index 7791bbc71..50453e1ba 100644
--- a/src/plugins/clamd/clamav_plugin_gtk.c
+++ b/src/plugins/clamd/clamav_plugin_gtk.c
@@ -110,12 +110,12 @@ static void check_permission(gchar* folder) {
if (g_stat(folder, &info) < 0)
return;
mode_t perm = info.st_mode & ~(S_IFMT);
- debug_print("%s: Old file permission: %05o\n", folder, perm);
+ debug_print("%s: old file permission: %05o\n", folder, perm);
if ((perm & S_IXOTH) != S_IXOTH) {
perm = perm | S_IXOTH;
g_chmod(folder, perm);
}
- debug_print("%s: New file permission: %05o\n", folder, perm);
+ debug_print("%s: new file permission: %05o\n", folder, perm);
}
static void folder_permission_cb(GtkWidget *widget, gpointer data) {
diff --git a/src/plugins/clamd/libclamd/clamd-plugin.c b/src/plugins/clamd/libclamd/clamd-plugin.c
index 4c18b6e33..7789ed70a 100644
--- a/src/plugins/clamd/libclamd/clamd-plugin.c
+++ b/src/plugins/clamd/libclamd/clamd-plugin.c
@@ -117,8 +117,8 @@ void clamd_create_config_automatic(const gchar* path) {
debug_print("Opening %s to parse config file\n", path);
conf = claws_fopen(path, "r");
if (!conf) {
- /*g_error("%s: Unable to open", path);*/
- alertpanel_error(_("%s: Unable to open\nclamd will be disabled"), path);
+ /*g_error("%s: unable to open", path);*/
+ alertpanel_error(_("%s: unable to open\nclamd will be disabled"), path);
return;
}
while (claws_fgets(buf, sizeof(buf), conf)) {
@@ -206,8 +206,8 @@ void clamd_create_config_automatic(const gchar* path) {
}
claws_fclose(conf);
if (! (Socket && (Socket->socket.port || Socket->socket.path))) {
- /*g_error("%s: Not able to find required information", path);*/
- alertpanel_error(_("%s: Not able to find required information\nclamd will be disabled"), path);
+ /*g_error("%s: not able to find required information", path);*/
+ alertpanel_error(_("%s: not able to find required information\nclamd will be disabled"), path);
}
/*debug_set_mode(FALSE);*/
}
@@ -240,7 +240,7 @@ void clamd_create_config_manual(const gchar* host, int port) {
Socket->socket.host = g_strdup(host);
}
else {
- /*g_error("%s: Not able to find required information", path);*/
+ /*g_error("%s: not able to find required information", path);*/
alertpanel_error(_("Could not create socket"));
}
}
@@ -432,7 +432,7 @@ static Clamd_Stat clamd_stream_scan(int sock,
memset(*res, '\0', size);
if (! g_file_test(path, G_FILE_TEST_EXISTS)) {
- *res = g_strconcat("ERROR -> ", path, _(": File does not exist"), NULL);
+ *res = g_strconcat("ERROR -> ", path, _(": file does not exist"), NULL);
debug_print("res: %s\n", *res);
return SCAN_ERROR;
}
@@ -444,8 +444,8 @@ static Clamd_Stat clamd_stream_scan(int sock,
#endif
if (fd < 0) {
- /*g_error("%s: Unable to open", path);*/
- *res = g_strconcat("ERROR -> ", path, _(": Unable to open"), NULL);
+ /*g_error("%s: unable to open", path);*/
+ *res = g_strconcat("ERROR -> ", path, _(": unable to open"), NULL);
return SCAN_ERROR;
}
@@ -476,7 +476,7 @@ static Clamd_Stat clamd_stream_scan(int sock,
}
if (count == -1) {
close(fd);
- *res = g_strconcat("ERROR -> ", path, _("%s: Error reading"), NULL);
+ *res = g_strconcat("ERROR -> ", path, _("%s: error reading"), NULL);
return SCAN_ERROR;
}
close(fd);
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index 47228eb0c..c170dd0e9 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -127,7 +127,7 @@ gchar* ask_user_for_auth_code(const gchar *auth_uri)
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
GTK_BUTTONS_NONE,
- "<span weight=\"bold\" size=\"larger\">%s</span>", _("GData plugin: Authorization required"));
+ "<span weight=\"bold\" size=\"larger\">%s</span>", _("GData plugin: authorization required"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
_("You need to authorize Claws Mail to access your Google contact list to use the GData plugin."
"\n\nVisit Google's authorization page by pressing the button below. After you "
@@ -211,7 +211,7 @@ static void write_cache_to_file(void)
pfile = prefs_write_open(path);
g_free(path);
if(pfile == NULL) {
- debug_print("GData plugin error: Cannot open file " GDATA_CONTACTS_FILENAME " for writing\n");
+ debug_print("GData plugin error: cannot open file " GDATA_CONTACTS_FILENAME " for writing\n");
return;
}
@@ -249,9 +249,9 @@ static void write_cache_to_file(void)
/* Actual writing and cleanup */
xml_write_tree(rootnode, pfile->fp);
if (prefs_file_close(pfile) < 0)
- debug_print("GData plugin error: Failed to write file " GDATA_CONTACTS_FILENAME "\n");
+ debug_print("GData plugin error: failed to write file " GDATA_CONTACTS_FILENAME "\n");
else
- debug_print("GData plugin: Wrote cache to file " GDATA_CONTACTS_FILENAME "\n");
+ debug_print("GData plugin: wrote cache to file " GDATA_CONTACTS_FILENAME "\n");
/* Free XML tree */
xml_free_tree(rootnode);
@@ -284,13 +284,13 @@ static int add_gdata_contact_to_cache(GDataContactsContact *contact)
contacts_cache.contacts = g_slist_prepend(contacts_cache.contacts, cached_contact);
- debug_print("GData plugin: Added %s <%s>\n", cached_contact->full_name, cached_contact->address);
+ debug_print("GData plugin: added %s <%s>\n", cached_contact->full_name, cached_contact->address);
retval = 1;
}
}
if(retval == 0)
{
- debug_print("GData plugin: Skipped received contact \"%s\" because it doesn't have an email address\n",
+ debug_print("GData plugin: skipped received contact \"%s\" because it doesn't have an email address\n",
gdata_gd_name_get_full_name(gdata_contacts_contact_get_name(contact)));
}
return retval;
@@ -560,7 +560,7 @@ static void query()
if(cm_gdata_contacts_query_running)
{
- debug_print("GData plugin: Network query already in progress\n");
+ debug_print("GData plugin: network query already in progress\n");
return;
}
@@ -653,11 +653,11 @@ gboolean cm_gdata_update_contacts_cache(void)
{
if(prefs_common_get_prefs()->work_offline)
{
- debug_print("GData plugin: Offline mode\n");
+ debug_print("GData plugin: offline mode\n");
}
else
{
- debug_print("GData plugin: Querying contacts\n");
+ debug_print("GData plugin: querying contacts\n");
query();
}
return TRUE;
diff --git a/src/plugins/mailmbox/mailmbox_folder.c b/src/plugins/mailmbox/mailmbox_folder.c
index 179ec2486..4ef174a56 100644
--- a/src/plugins/mailmbox/mailmbox_folder.c
+++ b/src/plugins/mailmbox/mailmbox_folder.c
@@ -403,7 +403,7 @@ static gint claws_mailmbox_get_num_list(Folder *folder, FolderItem *item,
g_return_val_if_fail(item != NULL, -1);
- debug_print("mbox_get_last_num(): Scanning %s ...\n", item->path);
+ debug_print("mbox_get_last_num(): scanning %s ...\n", item->path);
*old_uids_valid = TRUE;
diff --git a/src/plugins/notification/notification_core.c b/src/plugins/notification/notification_core.c
index 2538fb73c..d09aa276a 100644
--- a/src/plugins/notification/notification_core.c
+++ b/src/plugins/notification/notification_core.c
@@ -199,7 +199,7 @@ void notification_core_get_msg_count_of_foldername(gchar *foldername, Notificati
}
}
if(!folder) {
- debug_print("Notification plugin: Error: Could not find folder %s\n", foldername);
+ debug_print("Notification plugin: error: could not find folder %s\n", foldername);
return;
}
@@ -312,7 +312,7 @@ gboolean notification_notified_hash_msginfo_update(MsgInfoUpdate *msg_update)
if(msg->msgid)
msgid = msg->msgid;
else {
- debug_print("Notification Plugin: Message has no message ID!\n");
+ debug_print("Notification Plugin: message has no message ID!\n");
msgid = "";
}
@@ -320,7 +320,7 @@ gboolean notification_notified_hash_msginfo_update(MsgInfoUpdate *msg_update)
if(g_hash_table_lookup(notified_hash, msgid) != NULL) {
- debug_print("Notification Plugin: Removing message id %s from hash "
+ debug_print("Notification Plugin: removing message id %s from hash "
"table\n", msgid);
g_hash_table_remove(notified_hash, msgid);
}
@@ -338,7 +338,7 @@ void notification_notified_hash_startup_init(void)
if(!notified_hash) {
notified_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, NULL);
- debug_print("Notification Plugin: Hash table created\n");
+ debug_print("Notification Plugin: hash table created\n");
}
folder_list = folder_get_list();
@@ -371,14 +371,14 @@ static gboolean notification_traverse_hash_startup(GNode *node, gpointer data)
if(msg->msgid)
msgid = msg->msgid;
else {
- debug_print("Notification Plugin: Message has no message ID!\n");
+ debug_print("Notification Plugin: message has no message ID!\n");
msgid = "";
}
/* If the message id is not yet in the hash, add it */
g_hash_table_insert(notified_hash, g_strdup(msgid),
GINT_TO_POINTER(1));
- debug_print("Notification Plugin: Init: Added msg id %s to the hash\n",
+ debug_print("Notification Plugin: init: added msg id %s to the hash\n",
msgid);
/* Decrement left count and check if we're already done */
new_msgs_left--;
@@ -400,7 +400,7 @@ void notification_core_free(void)
g_hash_table_destroy(msg_count_hash);
msg_count_hash = NULL;
}
- debug_print("Notification Plugin: Freed internal data\n");
+ debug_print("Notification Plugin: freed internal data\n");
}
void notification_new_unnotified_msgs(FolderItemUpdateData *update_data)
@@ -421,11 +421,11 @@ void notification_new_unnotified_msgs(FolderItemUpdateData *update_data)
if(msg->msgid)
msgid = msg->msgid;
else {
- debug_print("Notification Plugin: Message has not message ID!\n");
+ debug_print("Notification Plugin: message has not message ID!\n");
msgid = "";
}
- debug_print("Notification Plugin: Found msg %s, "
+ debug_print("Notification Plugin: found msg %s, "
"checking if it is in hash...\n", msgid);
/* Check if message is in hash table */
if(g_hash_table_lookup(notified_hash, msgid) != NULL)
@@ -619,10 +619,10 @@ gboolean notify_include_folder_type(FolderType ftype, gchar *uistr)
retval = TRUE;
}
else
- debug_print("Notification Plugin: Unknown folder type %d\n",ftype);
+ debug_print("Notification Plugin: unknown folder type %d\n",ftype);
break;
default:
- debug_print("Notification Plugin: Unknown folder type %d\n",ftype);
+ debug_print("Notification Plugin: unknown folder type %d\n",ftype);
}
return retval;
@@ -690,7 +690,7 @@ gchar* notification_validate_utf8_str(gchar *text)
gchar *utf8_str = NULL;
if(!g_utf8_validate(text, -1, NULL)) {
- debug_print("Notification plugin: String is not valid utf8, "
+ debug_print("Notification plugin: string is not valid utf8, "
"trying to fix it...\n");
/* fix it */
utf8_str = conv_codeset_strdup(text,
@@ -698,14 +698,14 @@ gchar* notification_validate_utf8_str(gchar *text)
CS_INTERNAL);
/* check if the fix worked */
if(utf8_str == NULL || !g_utf8_validate(utf8_str, -1, NULL)) {
- debug_print("Notification plugin: String is still not valid utf8, "
+ debug_print("Notification plugin: string is still not valid utf8, "
"sanitizing...\n");
utf8_str = g_malloc(strlen(text)*2+1);
conv_localetodisp(utf8_str, strlen(text)*2+1, text);
}
}
else {
- debug_print("Notification plugin: String is valid utf8\n");
+ debug_print("Notification plugin: string is valid utf8\n");
utf8_str = g_strdup(text);
}
return utf8_str;
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index 133756958..c34bf456d 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -139,8 +139,7 @@ guint notification_register_folder_specific_list(gchar *node_name)
hook_folder_update = hooks_register_hook(FOLDER_UPDATE_HOOKLIST,
my_folder_update_hook, NULL);
if(hook_folder_update == 0) {
- debug_print("Warning: Failed to register hook to folder update "
- "hooklist. "
+ debug_print("Warning: failed to register hook to folder update hooklist. "
"Strange things can occur when deleting folders.\n");
}
}
@@ -716,7 +715,7 @@ static void foldercheck_set_tree(SpecificFolderArrayEntry *entry)
folder = FOLDER(list->data);
if(folder == NULL) {
- debug_print("Notification plugin::foldercheck_set_tree(): Found a NULL folder.\n");
+ debug_print("Notification plugin::foldercheck_set_tree(): found a NULL folder.\n");
continue;
}
diff --git a/src/plugins/notification/notification_hotkeys.c b/src/plugins/notification/notification_hotkeys.c
index f2d51f045..8fe25b853 100644
--- a/src/plugins/notification/notification_hotkeys.c
+++ b/src/plugins/notification/notification_hotkeys.c
@@ -36,7 +36,7 @@ static GtkHotkeyInfo *hotkey_toggle_mainwindow = NULL;
static void hotkey_toggle_mainwindow_activated(GtkHotkeyInfo *hotkey, guint event_time, gpointer data)
{
g_return_if_fail(GTK_HOTKEY_IS_INFO(hotkey));
- debug_print("Notification plugin: Toggled hide/show window due to hotkey %s activation\n", gtk_hotkey_info_get_signature(hotkey));
+ debug_print("Notification plugin: toggled hide/show window due to hotkey %s activation\n", gtk_hotkey_info_get_signature(hotkey));
notification_toggle_hide_show_window();
}
@@ -51,7 +51,7 @@ static void unbind_toggle_mainwindow()
error = NULL;
gtk_hotkey_info_unbind(hotkey_toggle_mainwindow, &error);
if(error) {
- debug_print("Notification plugin: Failed to unbind toggle hotkey\n");
+ debug_print("Notification plugin: failed to unbind toggle hotkey\n");
g_error_free(error);
return;
}
@@ -64,7 +64,7 @@ static void unbind_toggle_mainwindow()
error = NULL;
gtk_hotkey_registry_delete_hotkey(registry, HOTKEYS_APP_ID, HOTKEY_KEY_ID_TOGGLED, &error);
if(error) {
- debug_print("Notification plugin: Failed to unregister toggle hotkey: %s\n", error->message);
+ debug_print("Notification plugin: failed to unregister toggle hotkey: %s\n", error->message);
g_error_free(error);
return;
}
@@ -84,7 +84,7 @@ static void update_hotkey_binding_toggle_mainwindow()
/* (re)create hotkey info */
hotkey_toggle_mainwindow = gtk_hotkey_info_new(HOTKEYS_APP_ID, HOTKEY_KEY_ID_TOGGLED, notify_config.hotkeys_toggle_mainwindow, NULL);
if(!hotkey_toggle_mainwindow) {
- debug_print("Notification plugin: Failed to create toggle hotkey for '%s'\n", notify_config.hotkeys_toggle_mainwindow);
+ debug_print("Notification plugin: failed to create toggle hotkey for '%s'\n", notify_config.hotkeys_toggle_mainwindow);
return;
}
@@ -92,7 +92,7 @@ static void update_hotkey_binding_toggle_mainwindow()
error = NULL;
gtk_hotkey_info_bind(hotkey_toggle_mainwindow, &error);
if(error) {
- debug_print("Notification plugin: Failed to bind toggle hotkey to '%s': %s\n", notify_config.hotkeys_toggle_mainwindow, error->message);
+ debug_print("Notification plugin: failed to bind toggle hotkey to '%s': %s\n", notify_config.hotkeys_toggle_mainwindow, error->message);
g_error_free(error);
return;
}
@@ -102,7 +102,7 @@ static void update_hotkey_binding_toggle_mainwindow()
void notification_hotkeys_update_bindings()
{
- debug_print("Notification plugin: Updating keybindings..\n");
+ debug_print("Notification plugin: updating keybindings..\n");
if(notify_config.hotkeys_enabled) {
update_hotkey_binding_toggle_mainwindow();
}
@@ -112,7 +112,7 @@ void notification_hotkeys_update_bindings()
void notification_hotkeys_unbind_all()
{
- debug_print("Notification plugin: Unbinding all keybindings..\n");
+ debug_print("Notification plugin: unbinding all keybindings..\n");
unbind_toggle_mainwindow();
}
diff --git a/src/plugins/notification/notification_indicator.c b/src/plugins/notification/notification_indicator.c
index 920a768df..7b6bb00c6 100644
--- a/src/plugins/notification/notification_indicator.c
+++ b/src/plugins/notification/notification_indicator.c
@@ -131,7 +131,7 @@ void notification_update_indicator(void)
NotificationMsgCount count;
if(!folder->name) {
- debug_print("Notification plugin: Warning: Ignoring unnamed mailbox in indicator applet\n");
+ debug_print("Notification plugin: warning: ignoring unnamed mailbox in indicator applet\n");
continue;
}
gchar *id = folder->name;
diff --git a/src/plugins/notification/notification_lcdproc.c b/src/plugins/notification/notification_lcdproc.c
index 0f131d107..ebaa780c0 100644
--- a/src/plugins/notification/notification_lcdproc.c
+++ b/src/plugins/notification/notification_lcdproc.c
@@ -88,7 +88,7 @@ void notification_lcdproc_connect(void)
*/
if (len <= 0) {
- debug_print("Notification plugin: Can't communicate with "
+ debug_print("Notification plugin: can't communicate with "
"LCDd server! Are you sure that "
"there is a LCDd server running on %s:%d?\n",
notify_config.lcdproc_hostname, notify_config.lcdproc_port);
diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c
index 507b7c6a7..99af2ed31 100644
--- a/src/plugins/notification/notification_popup.c
+++ b/src/plugins/notification/notification_popup.c
@@ -161,13 +161,13 @@ void notification_popup_msg(MsgInfo *msginfo)
else if(!strcmp(uistr, "RSSyl"))
nftype = F_TYPE_RSS;
else {
- debug_print("Notification Plugin: Unknown folder type %d\n",ftype);
+ debug_print("Notification Plugin: unknown folder type %d\n",ftype);
G_UNLOCK(popup);
return;
}
break;
default:
- debug_print("Notification Plugin: Unknown folder type %d\n",ftype);
+ debug_print("Notification Plugin: unknown folder type %d\n",ftype);
G_UNLOCK(popup);
return;
}
@@ -220,7 +220,7 @@ static void popup_timeout_fun(NotifyNotification *nn, gpointer data)
}
ppopup->count = 0;
G_UNLOCK(popup);
- debug_print("Notification Plugin: Popup closed due to timeout.\n");
+ debug_print("Notification Plugin: popup closed due to timeout.\n");
}
#else
@@ -243,7 +243,7 @@ static gboolean popup_timeout_fun(gpointer data)
}
ppopup->count = 0;
G_UNLOCK(popup);
- debug_print("Notification Plugin: Popup closed due to timeout.\n");
+ debug_print("Notification Plugin: popup closed due to timeout.\n");
return FALSE;
}
#endif
@@ -300,7 +300,7 @@ static gboolean notification_libnotify_create(MsgInfo *msginfo,
/* init libnotify if necessary */
if(!notify_is_initted()) {
if(!notify_init("claws-mail")) {
- debug_print("Notification Plugin: Failed to initialize libnotify. "
+ debug_print("Notification Plugin: failed to initialize libnotify. "
"No popup will be shown.\n");
return FALSE;
}
@@ -353,7 +353,7 @@ static gboolean notification_libnotify_create(MsgInfo *msginfo,
);
g_free(utf8_str);
if(ppopup->notification == NULL) {
- debug_print("Notification Plugin: Failed to create a new "
+ debug_print("Notification Plugin: failed to create a new "
"notification.\n");
return FALSE;
}
@@ -416,7 +416,7 @@ static gboolean notification_libnotify_create(MsgInfo *msginfo,
g_object_unref(pixbuf);
}
else /* This is not fatal */
- debug_print("Notification plugin: Icon could not be loaded.\n");
+ debug_print("Notification plugin: icon could not be loaded.\n");
/* timeout */
notify_notification_set_timeout(ppopup->notification, notify_config.popup_timeout);
@@ -430,7 +430,7 @@ static gboolean notification_libnotify_create(MsgInfo *msginfo,
/* Show the popup */
notify_notification_set_hint_string(ppopup->notification, "desktop-entry", "claws-mail");
if(!notify_notification_show(ppopup->notification, &(ppopup->error))) {
- debug_print("Notification Plugin: Failed to send notification: %s\n",
+ debug_print("Notification Plugin: failed to send notification: %s\n",
ppopup->error->message);
g_clear_error(&(ppopup->error));
g_object_unref(G_OBJECT(ppopup->notification));
@@ -438,7 +438,7 @@ static gboolean notification_libnotify_create(MsgInfo *msginfo,
return FALSE;
}
- debug_print("Notification Plugin: Popup created with libnotify.\n");
+ debug_print("Notification Plugin: popup created with libnotify.\n");
ppopup->count = 1;
/* Store path to message */
@@ -510,7 +510,7 @@ static gboolean notification_libnotify_add_msg(MsgInfo *msginfo,
break;
default:
/* Should not happen */
- debug_print("Notification Plugin: Unknown folder type ignored\n");
+ debug_print("Notification Plugin: unknown folder type ignored\n");
return FALSE;
}
@@ -518,20 +518,20 @@ static gboolean notification_libnotify_add_msg(MsgInfo *msginfo,
text, NULL);
g_free(text);
if(!retval) {
- debug_print("Notification Plugin: Failed to update notification.\n");
+ debug_print("Notification Plugin: failed to update notification.\n");
return FALSE;
}
/* Show the popup */
notify_notification_set_hint_string(ppopup->notification, "desktop-entry", "claws-mail");
if(!notify_notification_show(ppopup->notification, &(ppopup->error))) {
- debug_print("Notification Plugin: Failed to send updated notification: "
+ debug_print("Notification Plugin: failed to send updated notification: "
"%s\n", ppopup->error->message);
g_clear_error(&(ppopup->error));
return FALSE;
}
- debug_print("Notification Plugin: Popup successfully modified "
+ debug_print("Notification Plugin: popup successfully modified "
"with libnotify.\n");
return TRUE;
}
diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c
index 50f4513ad..7486ce9f2 100644
--- a/src/plugins/notification/notification_trayicon.c
+++ b/src/plugins/notification/notification_trayicon.c
@@ -208,13 +208,13 @@ void notification_trayicon_msg(MsgInfo *msginfo)
else if(!strcmp(uistr, "RSSyl"))
nftype = F_TYPE_RSS;
else {
- debug_print("Notification Plugin: Unknown folder type %d\n",ftype);
+ debug_print("Notification Plugin: unknown folder type %d\n",ftype);
G_UNLOCK(trayicon_popup);
return;
}
break;
default:
- debug_print("Notification Plugin: Unknown folder type %d\n",ftype);
+ debug_print("Notification Plugin: unknown folder type %d\n",ftype);
G_UNLOCK(trayicon_popup);
return;
}
@@ -268,7 +268,7 @@ void notification_update_trayicon()
old_icon = notification_trayicon_create();
if(!trayicon) {
- debug_print("Notification plugin: Could not create trayicon\n");
+ debug_print("Notification plugin: could not create trayicon\n");
return;
}
}
@@ -606,19 +606,19 @@ static gboolean notification_trayicon_popup_add_msg(MsgInfo *msginfo,
g_free(summary);
g_free(utf8_str);
if(!retval) {
- debug_print("Notification Plugin: Failed to update notification.\n");
+ debug_print("Notification Plugin: failed to update notification.\n");
return FALSE;
}
/* Show the popup */
notify_notification_set_hint_string(popup.notification, "desktop-entry", "claws-mail");
if(!notify_notification_show(popup.notification, &(popup.error))) {
- debug_print("Notification Plugin: Failed to send updated notification: "
+ debug_print("Notification Plugin: failed to send updated notification: "
"%s\n", popup.error->message);
g_clear_error(&(popup.error));
return FALSE;
}
- debug_print("Notification Plugin: Popup successfully modified "
+ debug_print("Notification Plugin: popup successfully modified "
"with libnotify.\n");
return TRUE;
@@ -636,7 +636,7 @@ static gboolean notification_trayicon_popup_create(MsgInfo *msginfo,
/* init libnotify if necessary */
if(!notify_is_initted()) {
if(!notify_init("claws-mail")) {
- debug_print("Notification Plugin: Failed to initialize libnotify. "
+ debug_print("Notification Plugin: failed to initialize libnotify. "
"No popups will be shown.\n");
return FALSE;
}
@@ -682,7 +682,7 @@ static gboolean notification_trayicon_popup_create(MsgInfo *msginfo,
notification_trayicon_popup_free_func);
if(popup.notification == NULL) {
- debug_print("Notification Plugin: Failed to create a new notification.\n");
+ debug_print("Notification Plugin: failed to create a new notification.\n");
return FALSE;
}
@@ -722,7 +722,7 @@ static gboolean notification_trayicon_popup_create(MsgInfo *msginfo,
g_object_unref(pixbuf);
}
else /* This is not fatal */
- debug_print("Notification plugin: Icon could not be loaded.\n");
+ debug_print("Notification plugin: icon could not be loaded.\n");
/* timeout */
notify_notification_set_timeout(popup.notification, notify_config.trayicon_popup_timeout);
@@ -736,7 +736,7 @@ static gboolean notification_trayicon_popup_create(MsgInfo *msginfo,
/* Show the popup */
notify_notification_set_hint_string(popup.notification, "desktop-entry", "claws-mail");
if(!notify_notification_show(popup.notification, &(popup.error))) {
- debug_print("Notification Plugin: Failed to send notification: %s\n",
+ debug_print("Notification Plugin: failed to send notification: %s\n",
popup.error->message);
g_clear_error(&(popup.error));
g_object_unref(G_OBJECT(popup.notification));
@@ -757,7 +757,7 @@ static gboolean notification_trayicon_popup_create(MsgInfo *msginfo,
popup.msg_path = NULL;
}
- debug_print("Notification Plugin: Popup created with libnotify.\n");
+ debug_print("Notification Plugin: popup created with libnotify.\n");
return TRUE;
}
@@ -817,7 +817,7 @@ static void notification_trayicon_popup_default_action_cb(NotifyNotification
G_LOCK(trayicon_popup);
select_str = g_strdup(popup.msg_path);
G_UNLOCK(trayicon_popup);
- debug_print("Notification plugin: Select message %s\n", select_str);
+ debug_print("Notification plugin: select message %s\n", select_str);
mainwindow_jump_to(select_str, FALSE);
g_free(select_str);
}
@@ -840,7 +840,7 @@ static void notification_trayicon_popup_count_msgs(NotificationFolderType nftype
popup.num_rss++;
break;
default:
- debug_print("Notification plugin: Unknown folder type\n");
+ debug_print("Notification plugin: unknown folder type\n");
return;
}
popup.count++;
diff --git a/src/plugins/perl/perl_plugin.c b/src/plugins/perl/perl_plugin.c
index ee9e15f21..8688aa42d 100644
--- a/src/plugins/perl/perl_plugin.c
+++ b/src/plugins/perl/perl_plugin.c
@@ -1540,7 +1540,7 @@ static XS(XS_ClawsMail_move_to_trash)
}
dest_folder = folder_get_default_trash();
if (!dest_folder) {
- g_warning("Perl plugin: move_to_trash: Trash folder not found");
+ g_warning("Perl plugin: move_to_trash: trash folder not found");
XSRETURN_UNDEF;
}
if (folder_item_move_msg(dest_folder, msginfo) == -1) {
@@ -1759,7 +1759,7 @@ static int perl_load_file(void)
}
else {
if (prefs_common_get_ext_editor_cmd())
- g_warning("Perl plugin: External editor command-line is invalid: `%s'",
+ g_warning("Perl plugin: external editor command-line is invalid: `%s'",
prefs_common_get_ext_editor_cmd());
g_snprintf(buf, sizeof(buf), "emacs %s", perlfilter);
}
diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index df6fff894..7e3134bdc 100644
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -157,7 +157,7 @@ try_again:
gtk_main_iteration();
goto try_again;
} else {
- g_warning("OOPS: Could not grab mouse");
+ g_warning("OOPS: could not grab mouse");
gtk_widget_destroy(window);
return NULL;
}
@@ -165,7 +165,7 @@ try_again:
if (gdk_keyboard_grab(gdkwin, FALSE, GDK_CURRENT_TIME)) {
gdk_display_pointer_ungrab(gdk_display_get_default(),
GDK_CURRENT_TIME);
- g_warning("OOPS: Could not grab keyboard");
+ g_warning("OOPS: could not grab keyboard");
gtk_widget_destroy(window);
return NULL;
}
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 91a93ce72..a0544f266 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -435,7 +435,7 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
err = gpgme_get_key(ctx, sig->fpr, &key, 0);
if (gpg_err_code(err) == GPG_ERR_NO_AGENT) {
if (!warned)
- alertpanel_error(_("PGP Core: Can't get key - no gpg-agent running."));
+ alertpanel_error(_("PGP Core: can't get key - no gpg-agent running."));
else
g_warning("PGP Core: can't get key - no gpg-agent running");
warned = TRUE;
@@ -615,7 +615,7 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
if (sig->pka_trust == 1 && sig->pka_address) {
g_string_append_printf(siginfo,
- _("WARNING: Signer's address \"%s\" "
+ _("WARNING: signer's address \"%s\" "
"does not match DNS entry\n"),
sig->pka_address);
}
diff --git a/src/plugins/python/clawsmailmodule.c b/src/plugins/python/clawsmailmodule.c
index e8482a1e2..290e704a3 100644
--- a/src/plugins/python/clawsmailmodule.c
+++ b/src/plugins/python/clawsmailmodule.c
@@ -770,7 +770,7 @@ static PyMethodDef ClawsMailMethods[] = {
"\n"
"Takes an argument of type clawsmail.Folder, and selects the corresponding folder.\n"
"\n"
- "DEPRECATED: Use folderview_select() instead."},
+ "DEPRECATED: use folderview_select() instead."},
{"get_folderview_selected_mailbox", get_folderview_selected_mailbox, METH_NOARGS,
"get_folderview_selected_mailbox() - get selected mailbox in folderview\n"
@@ -931,7 +931,7 @@ PyMODINIT_FUNC initclawsmail(void)
/* add module member "compose_window" set to None */
Py_INCREF(Py_None);
if (PyModule_AddObject(cm_module, "compose_window", Py_None) == -1)
- debug_print("Error: Could not add object 'compose_window'\n");
+ debug_print("Error: could not add object 'compose_window'\n");
/* initialize classes */
ok = ok && cmpy_add_node(cm_module);
diff --git a/src/plugins/python/composewindowtype.c b/src/plugins/python/composewindowtype.c
index c6edfb2b5..7a8eecb60 100644
--- a/src/plugins/python/composewindowtype.c
+++ b/src/plugins/python/composewindowtype.c
@@ -531,7 +531,7 @@ static int set_account(clawsmail_ComposeWindowObject *self, PyObject *value, voi
}
if(!clawsmail_account_check(value)) {
- PyErr_SetString(PyExc_TypeError, "ComposeWindow.account: Can only assign an account");
+ PyErr_SetString(PyExc_TypeError, "ComposeWindow.account: can only assign an account");
return -1;
}
@@ -543,7 +543,7 @@ static int set_account(clawsmail_ComposeWindowObject *self, PyObject *value, voi
}
if(!self->compose || !self->compose->account_combo) {
- PyErr_SetString(PyExc_RuntimeError, "ComposeWindow: Cannot access account");
+ PyErr_SetString(PyExc_RuntimeError, "ComposeWindow: cannot access account");
return -1;
}
@@ -569,7 +569,7 @@ static PyMethodDef ComposeWindow_methods[] = {
"set_from(text) - set From header entry to text\n"
"\n"
"Set the From header entry to text. text must be a string.\n"
- "Beware: No sanity checking is performed."},
+ "Beware: no sanity checking is performed."},
{"get_from", (PyCFunction)ComposeWindow_get_from, METH_NOARGS,
"get_from - get From header entry\n"
diff --git a/src/plugins/python/foldertype.c b/src/plugins/python/foldertype.c
index 44479ed26..d21506f43 100644
--- a/src/plugins/python/foldertype.c
+++ b/src/plugins/python/foldertype.c
@@ -259,7 +259,7 @@ static PyMethodDef Folder_methods[] = {
"get_identifier() - get identifier\n"
"\n"
"Get identifier for folder as a string (e.g. #mh/foo/bar).\n\n"
- "DEPRECATED: Use identifier property instead."},
+ "DEPRECATED: use identifier property instead."},
{"get_messages", (PyCFunction)Folder_get_messages, METH_NOARGS,
"get_messages() - get a tuple of messages in folder\n"
@@ -284,7 +284,7 @@ static PyGetSetDef Folder_getset[] = {
{"mailbox_name", (getter)get_mailbox_name, (setter)NULL,
"mailbox_name - name of the corresponding mailbox\n\n"
- "DEPRECATED: Use folder.mailbox.name instead", NULL},
+ "DEPRECATED: use folder.mailbox.name instead", NULL},
{"properties", (getter)get_properties, (setter)NULL,
"properties - folder properties object", NULL},
diff --git a/src/plugins/python/python-hooks.c b/src/plugins/python/python-hooks.c
index 9d482f6e3..d389773bb 100644
--- a/src/plugins/python/python-hooks.c
+++ b/src/plugins/python/python-hooks.c
@@ -159,7 +159,7 @@ parasite_python_init(char **error)
python_dlhandle = dlopen(PYTHON_SHARED_LIB, RTLD_NOW | RTLD_GLOBAL);
if (python_dlhandle == NULL)
{
- *error = g_strdup_printf("Parasite: Error on dlopen(): %s\n", dlerror());
+ *error = g_strdup_printf("Parasite: error on dlopen(): %s\n", dlerror());
return 0;
}
@@ -208,7 +208,7 @@ parasite_python_init(char **error)
if (pygtk == NULL)
{
- *error = g_strdup("Parasite: Could not import gi");
+ *error = g_strdup("Parasite: could not import gi");
dlclose(python_dlhandle);
python_dlhandle = NULL;
return 0;
diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index ef84a75fc..895e2ceaa 100644
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -170,7 +170,7 @@ static gchar* extract_filename(const gchar *str)
filename = g_strrstr(str, "/");
if(!filename || *(filename+1) == '\0') {
- debug_print("Error: Could not extract filename from %s\n", str);
+ debug_print("Error: could not extract filename from %s\n", str);
return NULL;
}
filename++;
@@ -182,7 +182,7 @@ static void run_script_file(const gchar *filename, Compose *compose)
FILE *fp;
fp = claws_fopen(filename, "r");
if(!fp) {
- debug_print("Error: Could not open file '%s'\n", filename);
+ debug_print("Error: could not open file '%s'\n", filename);
return;
}
put_composewindow_into_module(compose);
@@ -320,9 +320,9 @@ static void migrate_scripts_out_of_base_dir(void)
gchar *dest_file;
dest_file = g_strconcat(dest_dir, G_DIR_SEPARATOR_S, filename, NULL);
if(move_file(filepath, dest_file, FALSE) == 0)
- debug_print("Python plugin: Moved file '%s' to %s subdir\n", filename, PYTHON_SCRIPTS_MAIN_DIR);
+ debug_print("Python plugin: moved file '%s' to %s subdir\n", filename, PYTHON_SCRIPTS_MAIN_DIR);
else
- debug_print("Python plugin: Warning: Could not move file '%s' to %s subdir\n", filename, PYTHON_SCRIPTS_MAIN_DIR);
+ debug_print("Python plugin: warning: could not move file '%s' to %s subdir\n", filename, PYTHON_SCRIPTS_MAIN_DIR);
g_free(dest_file);
}
g_free(filepath);
@@ -488,7 +488,7 @@ static void browse_python_scripts_dir(GtkAction *action, gpointer data)
mainwin = mainwindow_get_mainwindow();
if(!mainwin) {
- debug_print("Browse Python scripts: Problems getting the mainwindow\n");
+ debug_print("Browse Python scripts: problems getting the mainwindow\n");
return;
}
launch_context = gdk_app_launch_context_new();
@@ -497,7 +497,7 @@ static void browse_python_scripts_dir(GtkAction *action, gpointer data)
g_app_info_launch_default_for_uri(uri, G_APP_LAUNCH_CONTEXT(launch_context), &error);
if(error) {
- debug_print("Could not open scripts dir browser: '%s'\n", error->message);
+ debug_print("could not open scripts dir browser: '%s'\n", error->message);
g_error_free(error);
}
@@ -598,19 +598,19 @@ static PyObject *get_StringIO_instance(void)
module_StringIO = PyImport_ImportModule("io");
if(!module_StringIO) {
- debug_print("Error getting traceback: Could not import module io\n");
+ debug_print("Error getting traceback: could not import module io\n");
goto done;
}
class_StringIO = PyObject_GetAttrString(module_StringIO, "StringIO");
if(!class_StringIO) {
- debug_print("Error getting traceback: Could not get StringIO class\n");
+ debug_print("Error getting traceback: could not get StringIO class\n");
goto done;
}
inst_StringIO = PyObject_CallObject(class_StringIO, NULL);
if(!inst_StringIO) {
- debug_print("Error getting traceback: Could not create an instance of the StringIO class\n");
+ debug_print("Error getting traceback: could not create an instance of the StringIO class\n");
goto done;
}
diff --git a/src/plugins/rssyl/old_feeds.c b/src/plugins/rssyl/old_feeds.c
index 175d31094..573bc37df 100644
--- a/src/plugins/rssyl/old_feeds.c
+++ b/src/plugins/rssyl/old_feeds.c
@@ -62,7 +62,7 @@ static void _elparse_start_oldrssyl(void *data, const gchar *el,
of->silent_update = GETVAL_INT("silent_update");
of->ssl_verify_peer = GETVAL_INT("ssl_verify_peer");
- debug_print("RSSyl: old feeds.xml: Adding '%s' (%s).\n", of->name,
+ debug_print("RSSyl: old feeds.xml: adding '%s' (%s).\n", of->name,
of->url);
ctx->oldfeeds = g_slist_prepend(ctx->oldfeeds, of);
diff --git a/src/plugins/rssyl/opml_export.c b/src/plugins/rssyl/opml_export.c
index f0b3b95ee..c3ce3c136 100644
--- a/src/plugins/rssyl/opml_export.c
+++ b/src/plugins/rssyl/opml_export.c
@@ -128,7 +128,7 @@ void rssyl_opml_export(void)
log_warning(LOG_PROTOCOL,
_("RSSyl: couldn't delete old OPML file '%s': %s\n"),
opmlfile, g_strerror(errno));
- debug_print("RSSyl: Couldn't delete old file '%s'\n", opmlfile);
+ debug_print("RSSyl: couldn't delete old file '%s'\n", opmlfile);
g_free(opmlfile);
return;
}
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index 73eb76319..e7ffb1b65 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -211,7 +211,7 @@ static void rssyl_get_last_num(Folder *folder, FolderItem *item)
g_return_if_fail(item != NULL);
- debug_print("RSSyl: rssyl_get_last_num(): Scanning %s ...\n", item->path);
+ debug_print("RSSyl: rssyl_get_last_num(): scanning %s ...\n", item->path);
path = folder_item_get_path(item);
g_return_if_fail(path != NULL);
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index 66ed8f4e6..8d5f2c18f 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -184,7 +184,7 @@ rssyl_props_cancel_cb(GtkWidget *widget, gpointer data)
{
RFolderItem *ritem = (RFolderItem *)data;
- debug_print("RSSyl: cancel pressed\n");
+ debug_print("RSSyl: Cancel pressed\n");
gtk_widget_destroy(ritem->feedprop->window);
diff --git a/src/plugins/smime/smime.c b/src/plugins/smime/smime.c
index d4262daaa..905eb336e 100644
--- a/src/plugins/smime/smime.c
+++ b/src/plugins/smime/smime.c
@@ -790,7 +790,7 @@ gboolean smime_sign(MimeInfo *mimeinfo, PrefsAccount *account, const gchar *from
err = gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_DETACH);
if (err != GPG_ERR_NO_ERROR) {
- alertpanel_error("S/MIME : Cannot sign, %s (%d)", gpg_strerror(err), gpg_err_code(err));
+ alertpanel_error("S/MIME : cannot sign, %s (%d)", gpg_strerror(err), gpg_err_code(err));
gpgme_data_release(gpgtext);
gpgme_release(ctx);
return FALSE;
diff --git a/src/plugins/spamassassin/libspamc.c b/src/plugins/spamassassin/libspamc.c
index 8f2cd79fd..12e9e97b3 100644
--- a/src/plugins/spamassassin/libspamc.c
+++ b/src/plugins/spamassassin/libspamc.c
@@ -907,7 +907,7 @@ int message_read(int fd, int flags, struct message *m)
return _message_read_bsmtp(fd, m);
default:
- libspamc_log(flags, LOG_ERR, "message_read: Unknown mode %d",
+ libspamc_log(flags, LOG_ERR, "message_read: unknown mode %d",
flags & SPAMC_MODE_MASK);
return EX_USAGE;
}
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list