[Commits] [SCM] claws branch, master, updated. 4.3.1-73-g5119d2d72
wwp at claws-mail.org
wwp at claws-mail.org
Wed Mar 26 21:01:32 UTC 2025
The branch, master has been updated
via 5119d2d726940350ecc9b59abff1c332e6364344 (commit)
from 70fd8f14b0a5feaab15c754b9296cc9bdc879769 (commit)
Summary of changes:
src/plugins/gdata/cm_gdata_contacts.c | 30 +++++++++++++++---------------
src/plugins/rssyl/old_feeds.c | 4 ++--
src/plugins/rssyl/opml_export.c | 16 ++++++++--------
src/plugins/rssyl/opml_import.c | 2 +-
src/plugins/rssyl/parse822.c | 6 +++---
src/plugins/rssyl/rssyl.c | 6 +++---
src/plugins/rssyl/rssyl_add_item.c | 12 ++++++------
src/plugins/rssyl/rssyl_cb_menu.c | 2 +-
src/plugins/rssyl/rssyl_deleted.c | 6 +++---
src/plugins/rssyl/rssyl_feed.h | 16 ++++++++--------
src/plugins/rssyl/rssyl_feed_props.c | 2 +-
src/plugins/rssyl/rssyl_subscribe.c | 12 ++++++------
src/plugins/rssyl/rssyl_subscribe_gtk.c | 2 +-
src/plugins/rssyl/rssyl_update_comments.c | 2 +-
src/plugins/rssyl/rssyl_update_feed.c | 20 ++++++++++----------
src/plugins/rssyl/rssyl_update_format.c | 4 ++--
src/plugins/spam_report/spam_report.c | 6 +++---
17 files changed, 74 insertions(+), 74 deletions(-)
- Log -----------------------------------------------------------------
commit 5119d2d726940350ecc9b59abff1c332e6364344
Author: wwp <subscript at free.fr>
Date: Wed Mar 26 22:01:28 2025 +0100
Revert "Normalize capitalization in debug and log messages."
This reverts commit 6fbda0d3cacaae7473027089b43b775a8fa3f15c.
diff --git a/src/plugins/gdata/cm_gdata_contacts.c b/src/plugins/gdata/cm_gdata_contacts.c
index 47228eb0c..6c689613c 100644
--- a/src/plugins/gdata/cm_gdata_contacts.c
+++ b/src/plugins/gdata/cm_gdata_contacts.c
@@ -328,7 +328,7 @@ static void cm_gdata_query_contacts_ready(GDataContactsService *service, GAsyncR
if(error)
{
g_object_unref(feed);
- log_error(LOG_PROTOCOL, _("GData plugin: error querying for contacts: %s\n"), error->message);
+ log_error(LOG_PROTOCOL, _("GData plugin: Error querying for contacts: %s\n"), error->message);
g_error_free(error);
return;
}
@@ -356,7 +356,7 @@ static void query_contacts(GDataContactsService *service)
{
GDataContactsQuery *query;
- log_message(LOG_PROTOCOL, _("GData plugin: starting async contacts query\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Starting async contacts query\n"));
query = gdata_contacts_query_new(NULL);
gdata_contacts_query_set_group(query, contacts_group_id);
@@ -377,7 +377,7 @@ static void cm_gdata_query_groups_ready(GDataContactsService *service, GAsyncRes
if(error)
{
g_object_unref(feed);
- log_error(LOG_PROTOCOL, _("GData plugin: error querying for groups: %s\n"), error->message);
+ log_error(LOG_PROTOCOL, _("GData plugin: Error querying for groups: %s\n"), error->message);
g_error_free(error);
return;
}
@@ -413,14 +413,14 @@ static void cm_gdata_query_groups_ready(GDataContactsService *service, GAsyncRes
}
g_object_unref(feed);
- log_message(LOG_PROTOCOL, _("GData plugin: groups received\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Groups received\n"));
query_contacts(service);
}
static void query_for_contacts_group_id(GDataAuthorizer *authorizer)
{
- log_message(LOG_PROTOCOL, _("GData plugin: starting async groups query\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Starting async groups query\n"));
gdata_contacts_service_query_groups_async(service, NULL, NULL, NULL, NULL, NULL,
(GAsyncReadyCallback)cm_gdata_query_groups_ready, NULL);
@@ -445,14 +445,14 @@ static void cm_gdata_auth_ready(GDataOAuth2Authorizer *auth, GAsyncResult *res,
/* Notify the user of all errors except cancellation errors */
if(!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
{
- log_error(LOG_PROTOCOL, _("GData plugin: authorization error: %s\n"), error->message);
+ log_error(LOG_PROTOCOL, _("GData plugin: Authorization error: %s\n"), error->message);
}
g_error_free(error);
cm_gdata_contacts_query_running = FALSE;
return;
}
- log_message(LOG_PROTOCOL, _("GData plugin: authorization successful\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Authorization successful\n"));
query_after_auth();
}
@@ -472,27 +472,27 @@ static void cm_gdata_interactive_auth()
interactive_auth_running = TRUE;
- log_message(LOG_PROTOCOL, _("GData plugin: starting interactive authorization\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Starting interactive authorization\n"));
auth_code = ask_user_for_auth_code(auth_uri);
if(auth_code)
{
cm_gdata_contacts_query_running = TRUE;
- log_message(LOG_PROTOCOL, _("GData plugin: got authorization code, requesting authorization\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Got authorization code, requesting authorization\n"));
gdata_oauth2_authorizer_request_authorization_async(authorizer, auth_code, NULL, (GAsyncReadyCallback)cm_gdata_auth_ready, NULL);
memset(auth_code, 0, strlen(auth_code));
g_free(auth_code);
}
else
{
- log_warning(LOG_PROTOCOL, _("GData plugin: no authorization code received, authorization request cancelled\n"));
+ log_warning(LOG_PROTOCOL, _("GData plugin: No authorization code received, authorization request cancelled\n"));
}
interactive_auth_running = FALSE;
}
else
{
- log_message(LOG_PROTOCOL, _("GData plugin: interactive authorization still running, no additional session started\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Interactive authorization still running, no additional session started\n"));
}
g_free(auth_uri);
@@ -509,7 +509,7 @@ static void cm_gdata_refresh_ready(GDataOAuth2Authorizer *auth, GAsyncResult *re
/* Notify the user of all errors except cancellation errors */
if(!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
{
- log_error(LOG_PROTOCOL, _("GData plugin: authorization refresh error: %s\n"), error->message);
+ log_error(LOG_PROTOCOL, _("GData plugin: Authorization refresh error: %s\n"), error->message);
if(mainwindow_get_mainwindow())
{
@@ -533,7 +533,7 @@ static void cm_gdata_refresh_ready(GDataOAuth2Authorizer *auth, GAsyncResult *re
return;
}
- log_message(LOG_PROTOCOL, _("GData plugin: authorization refresh successful\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Authorization refresh successful\n"));
g_timer_start(refresh_timer);
@@ -593,7 +593,7 @@ static void query()
elapsed_time_min = (int)((g_timer_elapsed(refresh_timer, NULL)/60.0)+0.5);
if(elapsed_time_min > REFRESH_TIMEOUT_MINUTES)
{
- log_message(LOG_PROTOCOL, _("GData plugin: elapsed time since last refresh: %d minutes, refreshing now\n"), elapsed_time_min);
+ log_message(LOG_PROTOCOL, _("GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"), elapsed_time_min);
gdata_authorizer_refresh_authorization_async(GDATA_AUTHORIZER(authorizer), NULL, (GAsyncReadyCallback)cm_gdata_refresh_ready, NULL);
}
else if(!gdata_service_is_authorized(GDATA_SERVICE(service)))
@@ -601,7 +601,7 @@ static void query()
/* Try to restore from saved refresh token.*/
if((token = passwd_store_get(PWS_PLUGIN, "GData", GDATA_TOKEN_PWD_STRING)) != NULL)
{
- log_message(LOG_PROTOCOL, _("GData plugin: trying to refresh authorization\n"));
+ log_message(LOG_PROTOCOL, _("GData plugin: Trying to refresh authorization\n"));
gdata_oauth2_authorizer_set_refresh_token(authorizer, token);
memset(token, 0, strlen(token));
g_free(token);
diff --git a/src/plugins/rssyl/old_feeds.c b/src/plugins/rssyl/old_feeds.c
index 175d31094..d41db2b60 100644
--- a/src/plugins/rssyl/old_feeds.c
+++ b/src/plugins/rssyl/old_feeds.c
@@ -85,13 +85,13 @@ GSList *rssyl_old_feed_metadata_parse(gchar *filepath)
GError *error = NULL;
struct _oldrssyl_ctx *ctx;
- debug_print("RSSyl: starting to parse old feeds.xml\n");
+ debug_print("RSSyl: Starting to parse old feeds.xml\n");
/* Read contents of the file into memory */
if (!g_file_get_contents(filepath, &contents, &length, &error)) {
alertpanel_error(_("Couldn't read contents of old feeds.xml file:\n%s"),
error->message);
- debug_print("RSSyl: couldn't read contents of feeds.xml\n");
+ debug_print("RSSyl: Couldn't read contents of feeds.xml\n");
g_error_free(error);
return NULL;
}
diff --git a/src/plugins/rssyl/opml_export.c b/src/plugins/rssyl/opml_export.c
index f0b3b95ee..3c48467a5 100644
--- a/src/plugins/rssyl/opml_export.c
+++ b/src/plugins/rssyl/opml_export.c
@@ -105,9 +105,9 @@ static void rssyl_opml_export_func(FolderItem *item, gpointer data)
if( err ) {
log_warning(LOG_PROTOCOL,
- _("RSSyl: error while writing '%s' to feed export list.\n"),
+ _("RSSyl: Error while writing '%s' to feed export list.\n"),
item->name);
- debug_print("RSSyl: error while writing '%s' to feed_export list.\n",
+ debug_print("RSSyl: Error while writing '%s' to feed_export list.\n",
item->name);
}
}
@@ -126,7 +126,7 @@ void rssyl_opml_export(void)
if( g_file_test(opmlfile, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR ) ) {
if (g_remove(opmlfile) != 0) {
log_warning(LOG_PROTOCOL,
- _("RSSyl: couldn't delete old OPML file '%s': %s\n"),
+ _("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);
g_free(opmlfile);
@@ -136,9 +136,9 @@ void rssyl_opml_export(void)
if( (f = claws_fopen(opmlfile, "w")) == NULL ) {
log_warning(LOG_PROTOCOL,
- _("RSSyl: couldn't open file '%s' for feed list exporting: %s\n"),
+ _("RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"),
opmlfile, g_strerror(errno));
- debug_print("RSSyl: couldn't open feed list export file, returning.\n");
+ debug_print("RSSyl: Couldn't open feed list export file, returning.\n");
g_free(opmlfile);
return;
}
@@ -177,11 +177,11 @@ void rssyl_opml_export(void)
"</opml>\n") < 0);
if( err ) {
- log_warning(LOG_PROTOCOL, _("RSSyl: error during writing feed export file.\n"));
- debug_print("RSSyl: error during writing feed export file.\n");
+ log_warning(LOG_PROTOCOL, _("RSSyl: Error during writing feed export file.\n"));
+ debug_print("RSSyl: Error during writing feed export file.\n");
}
- debug_print("RSSyl: feed export finished.\n");
+ debug_print("RSSyl: Feed export finished.\n");
claws_safe_fclose(f);
g_free(opmlfile);
diff --git a/src/plugins/rssyl/opml_import.c b/src/plugins/rssyl/opml_import.c
index 95ebd7a0a..ab994831a 100644
--- a/src/plugins/rssyl/opml_import.c
+++ b/src/plugins/rssyl/opml_import.c
@@ -75,7 +75,7 @@ void rssyl_opml_import_func(gchar *title, gchar *url, gint depth, gpointer data)
/* Find an unused name for new folder */
tmp = g_strdup(title);
while (folder_find_child_item_by_name((FolderItem *)ctx->current->data, tmp)) {
- debug_print("RSSyl: folder '%s' already exists, trying another name\n",
+ debug_print("RSSyl: Folder '%s' already exists, trying another name\n",
title);
g_free(tmp);
tmp = g_strdup_printf("%s__%d", title, ++i);
diff --git a/src/plugins/rssyl/parse822.c b/src/plugins/rssyl/parse822.c
index 69a3dcb47..9c9e74222 100644
--- a/src/plugins/rssyl/parse822.c
+++ b/src/plugins/rssyl/parse822.c
@@ -192,7 +192,7 @@ FeedItem *rssyl_parse_folder_item_file(gchar *path)
g_strfreev(line);
} else {
if( !strcmp(lines[i], RSSYL_TEXT_START) ) {
- debug_print("RSSyl: leading html tag found at line %d\n", i);
+ debug_print("RSSyl: Leading html tag found at line %d\n", i);
past_html_tag = TRUE;
if (body)
{
@@ -205,7 +205,7 @@ FeedItem *rssyl_parse_folder_item_file(gchar *path)
}
while( past_html_tag && !past_endhtml_tag && lines[i] ) {
if( !strcmp(lines[i], RSSYL_TEXT_END) ) {
- debug_print("RSSyl: trailing html tag found at line %d\n", i);
+ debug_print("RSSyl: Trailing html tag found at line %d\n", i);
past_endhtml_tag = TRUE;
continue;
}
@@ -298,7 +298,7 @@ static void rssyl_folder_read_existing_real(RFolderItem *ritem)
ctx = (RFeedCtx *)item->data;
if( ritem->last_update < ctx->last_seen )
ritem->last_update = ctx->last_seen;
- debug_print("RSSyl: appending '%s'\n", feed_item_get_title(item));
+ debug_print("RSSyl: Appending '%s'\n", feed_item_get_title(item));
ritem->items = g_slist_prepend(ritem->items, item);
}
g_free(fname);
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index 73eb76319..f7e2f3370 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -235,7 +235,7 @@ static void rssyl_get_last_num(Folder *folder, FolderItem *item)
}
g_dir_close(dp);
- debug_print("RSSyl: last number in dir %s = %d\n", item->path, max);
+ debug_print("RSSyl: Last number in dir %s = %d\n", item->path, max);
item->last_num = max;
}
@@ -500,7 +500,7 @@ static FolderItem *rssyl_create_folder(Folder *folder,
path = folder_item_get_path(parent);
if( !is_dir_exist(path) ) {
if( (make_dir_hier(path) != 0) ) {
- debug_print("RSSyl: couldn't create directory (rec) '%s'\n", path);
+ debug_print("RSSyl: Couldn't create directory (rec) '%s'\n", path);
return NULL;
}
}
@@ -509,7 +509,7 @@ static FolderItem *rssyl_create_folder(Folder *folder,
path = g_strconcat(path, G_DIR_SEPARATOR_S, basepath, NULL);
if( make_dir(path) < 0 ) {
- debug_print("RSSyl: couldn't create directory '%s'\n", path);
+ debug_print("RSSyl: Couldn't create directory '%s'\n", path);
g_free(path);
g_free(basepath);
return NULL;
diff --git a/src/plugins/rssyl/rssyl_add_item.c b/src/plugins/rssyl/rssyl_add_item.c
index f16b02d2e..f46ffb26f 100644
--- a/src/plugins/rssyl/rssyl_add_item.c
+++ b/src/plugins/rssyl/rssyl_add_item.c
@@ -367,13 +367,13 @@ void rssyl_add_item(RFolderItem *ritem, FeedItem *feed_item)
debug_print("RSSyl: rssyl_feed_item_exists returned %d\n", dif);
if( dif == EXISTS_UNCHANGED ) {
- debug_print("RSSyl: this item already exists, skipping...\n");
+ debug_print("RSSyl: This item already exists, skipping...\n");
return;
}
/* Item is already in the list, but has changed */
if( dif >= EXISTS_CHANGED && old_item != NULL ) {
- debug_print("RSSyl: item changed, removing old one and adding new.\n");
+ debug_print("RSSyl: Item changed, removing old one and adding new.\n");
/* Store permflags of the old item. */
ctx = (RFeedCtx *)old_item->data;
@@ -386,7 +386,7 @@ void rssyl_add_item(RFolderItem *ritem, FeedItem *feed_item)
ritem->items = g_slist_remove(ritem->items, old_item);
if (g_unlink(ctx->path) != 0) {
- debug_print("RSSyl: error, could not delete file '%s': %s\n",
+ debug_print("RSSyl: Error, could not delete file '%s': %s\n",
ctx->path, g_strerror(errno));
}
@@ -397,13 +397,13 @@ void rssyl_add_item(RFolderItem *ritem, FeedItem *feed_item)
/* Check against list of deleted items. */
if (rssyl_deleted_check(ritem, feed_item)) {
- debug_print("RSSyl: item '%s' found among deleted items, NOT adding it.\n",
+ debug_print("RSSyl: Item '%s' found among deleted items, NOT adding it.\n",
feed_item_get_title(feed_item));
return;
}
/* Add a new item, formatting its title along the way */
- debug_print("RSSyl: adding item '%s'\n", feed_item_get_title(feed_item));
+ debug_print("RSSyl: Adding item '%s'\n", feed_item_get_title(feed_item));
ritem->items = g_slist_prepend(ritem->items, feed_item_copy(feed_item));
dirname = folder_item_get_path(&ritem->item);
@@ -475,7 +475,7 @@ void rssyl_add_item(RFolderItem *ritem, FeedItem *feed_item)
fprintf(f, "X-RSSyl-OrigTitle: %s\n", feed_item_get_title(feed_item));
}
} else {
- debug_print("RSSyl: no feed title, it seems\n");
+ debug_print("RSSyl: No feed title, it seems\n");
fprintf(f, "Subject: (empty)\n");
}
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 151c2e62b..20f77e6e9 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -143,7 +143,7 @@ void rssyl_new_folder_cb(GtkAction *action,
/* TODO: Perhaps stop after X attempts? */
tmp = g_strdup(new_folder);
while (folder_find_child_item_by_name(item, tmp)) {
- debug_print("RSSyl: folder '%s' already exists, trying another name\n",
+ debug_print("RSSyl: Folder '%s' already exists, trying another name\n",
new_folder);
g_free(tmp);
tmp = g_strdup_printf("%s__%d", new_folder, ++i);
diff --git a/src/plugins/rssyl/rssyl_deleted.c b/src/plugins/rssyl/rssyl_deleted.c
index cf2104947..d5883c080 100644
--- a/src/plugins/rssyl/rssyl_deleted.c
+++ b/src/plugins/rssyl/rssyl_deleted.c
@@ -165,7 +165,7 @@ static void _store_one_deleted_item(gpointer data, gpointer user_data)
ditem->date_published) < 0);
if (err)
- debug_print("RSSyl: error during writing deletion file.\n");
+ debug_print("RSSyl: Error during writing deletion file.\n");
}
static void rssyl_deleted_store_internal(GSList *deleted_items, const gchar *deleted_file)
@@ -174,7 +174,7 @@ static void rssyl_deleted_store_internal(GSList *deleted_items, const gchar *del
if (g_file_test(deleted_file, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
if (g_remove(deleted_file) != 0) {
- debug_print("RSSyl: oops, couldn't delete '%s', bailing out\n",
+ debug_print("RSSyl: Oops, couldn't delete '%s', bailing out\n",
deleted_file);
return;
}
@@ -184,7 +184,7 @@ static void rssyl_deleted_store_internal(GSList *deleted_items, const gchar *del
return;
if ((f = claws_fopen(deleted_file, "w")) == NULL) {
- debug_print("RSSyl: couldn't open '%s', bailing out.\n", deleted_file);
+ debug_print("RSSyl: Couldn't open '%s', bailing out.\n", deleted_file);
return;
}
diff --git a/src/plugins/rssyl/rssyl_feed.h b/src/plugins/rssyl/rssyl_feed.h
index 7c72a7687..4987c9ece 100644
--- a/src/plugins/rssyl/rssyl_feed.h
+++ b/src/plugins/rssyl/rssyl_feed.h
@@ -25,14 +25,14 @@
#include "rssyl.h"
-#define RSSYL_LOG_SUBSCRIBING _("RSSyl: subscribing new feed: %s\n")
-#define RSSYL_LOG_SUBSCRIBED _("RSSyl: new feed subscribed: '%s' (%s)\n")
-#define RSSYL_LOG_UPDATING _("RSSyl: updating feed: %s (User Agent: %s)\n")
-#define RSSYL_LOG_UPDATED _("RSSyl: feed update finished: %s\n")
-#define RSSYL_LOG_ERROR_FETCH _("RSSyl: error fetching feed at '%s': %s\n")
-#define RSSYL_LOG_ERROR_NOFEED _("RSSyl: no valid feed found at '%s'\n")
-#define RSSYL_LOG_ERROR_PROC _("RSSyl: couldn't process feed at '%s'\n")
-#define RSSYL_LOG_ABORTED_EXITING _("RSSyl: application is exiting, couldn't finish updating feed at '%s'\n")
+#define RSSYL_LOG_SUBSCRIBING _("RSSyl: Subscribing new feed: %s\n")
+#define RSSYL_LOG_SUBSCRIBED _("RSSyl: New feed subscribed: '%s' (%s)\n")
+#define RSSYL_LOG_UPDATING _("RSSyl: Updating feed: %s (User Agent: %s)\n")
+#define RSSYL_LOG_UPDATED _("RSSyl: Feed update finished: %s\n")
+#define RSSYL_LOG_ERROR_FETCH _("RSSyl: Error fetching feed at '%s': %s\n")
+#define RSSYL_LOG_ERROR_NOFEED _("RSSyl: No valid feed found at '%s'\n")
+#define RSSYL_LOG_ERROR_PROC _("RSSyl: Couldn't process feed at '%s'\n")
+#define RSSYL_LOG_ABORTED_EXITING _("RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n")
typedef enum
{
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index ad9b5f1ce..850da27ab 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/rssyl/rssyl_subscribe.c b/src/plugins/rssyl/rssyl_subscribe.c
index 15b60e90f..63d196c2b 100644
--- a/src/plugins/rssyl/rssyl_subscribe.c
+++ b/src/plugins/rssyl/rssyl_subscribe.c
@@ -95,11 +95,11 @@ FolderItem *rssyl_subscribe(FolderItem *parent, const gchar *url,
sctx->feed = ctx->feed;
sctx->edit_properties = FALSE;
- debug_print("RSSyl: calling subscribe dialog routine...\n");
+ debug_print("RSSyl: Calling subscribe dialog routine...\n");
rssyl_subscribe_dialog(sctx);
if (sctx->feed == NULL) {
- debug_print("RSSyl: user cancelled subscribe.\n");
+ debug_print("RSSyl: User cancelled subscribe.\n");
g_free(sctx);
return NULL;
}
@@ -111,9 +111,9 @@ FolderItem *rssyl_subscribe(FolderItem *parent, const gchar *url,
}
if (sctx->edit_properties)
- debug_print("RSSyl: user wants to edit properties of the new feed.\n");
+ debug_print("RSSyl: User wants to edit properties of the new feed.\n");
else
- debug_print("RSSyl: user does not want to edit properties of the new feed.\n");
+ debug_print("RSSyl: User does not want to edit properties of the new feed.\n");
g_free(sctx->official_title);
g_free(sctx);
}
@@ -136,7 +136,7 @@ FolderItem *rssyl_subscribe(FolderItem *parent, const gchar *url,
#endif
while (folder_find_child_item_by_name(parent, tmpname2) != 0 && i < 20) {
- debug_print("RSSyl: folder '%s' already exists, trying another name\n",
+ debug_print("RSSyl: Folder '%s' already exists, trying another name\n",
tmpname2);
g_free(tmpname2);
tmpname2 = g_strdup_printf("%s__%d", tmpname, ++i);
@@ -159,7 +159,7 @@ FolderItem *rssyl_subscribe(FolderItem *parent, const gchar *url,
return NULL;
}
- debug_print("RSSyl: adding '%s'\n", ctx->feed->url);
+ debug_print("RSSyl: Adding '%s'\n", ctx->feed->url);
ritem = (RFolderItem *)new_item;
ritem->url = g_strdup(ctx->feed->url);
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.c b/src/plugins/rssyl/rssyl_subscribe_gtk.c
index ca6835553..0b26f15e4 100644
--- a/src/plugins/rssyl/rssyl_subscribe_gtk.c
+++ b/src/plugins/rssyl/rssyl_subscribe_gtk.c
@@ -83,7 +83,7 @@ void rssyl_subscribe_dialog(RSubCtx *ctx) {
/* Modify ctx->feed based on user changes in dialog */
newtitle = (gchar *)gtk_entry_get_text(GTK_ENTRY(title));
if (strcmp(feed_get_title(ctx->feed), newtitle)) {
- debug_print("RSSyl: using user-supplied feed title '%s', instead of '%s'\n", newtitle, feed_get_title(ctx->feed));
+ debug_print("RSSyl: Using user-supplied feed title '%s', instead of '%s'\n", newtitle, feed_get_title(ctx->feed));
ctx->official_title = g_strdup(feed_get_title(ctx->feed));
feed_set_title(ctx->feed, newtitle);
}
diff --git a/src/plugins/rssyl/rssyl_update_comments.c b/src/plugins/rssyl/rssyl_update_comments.c
index ff94d99e8..ee92fc481 100644
--- a/src/plugins/rssyl/rssyl_update_comments.c
+++ b/src/plugins/rssyl/rssyl_update_comments.c
@@ -128,7 +128,7 @@ void rssyl_update_comments(RFolderItem *ritem)
feed_item_get_id(fi));
if( !rssyl_parse_feed(ritem, fetchctx->feed) ) {
- debug_print("RSSyl: error processing comments feed\n");
+ debug_print("RSSyl: Error processing comments feed\n");
log_error(LOG_PROTOCOL, RSSYL_LOG_ERROR_PROC, fetchctx->feed->url);
}
}
diff --git a/src/plugins/rssyl/rssyl_update_feed.c b/src/plugins/rssyl/rssyl_update_feed.c
index 5d0afb34c..98c531ddc 100644
--- a/src/plugins/rssyl/rssyl_update_feed.c
+++ b/src/plugins/rssyl/rssyl_update_feed.c
@@ -167,7 +167,7 @@ void rssyl_fetch_feed(RFetchCtx *ctx, RSSylVerboseFlags verbose)
* display error dialogs for user. We always log the error. */
if( ctx->error != NULL ) {
/* libcurl wasn't happy */
- debug_print("RSSyl: error: %s\n", ctx->error);
+ debug_print("RSSyl: Error: %s\n", ctx->error);
if( verbose & RSSYL_SHOW_ERRORS) {
gchar *msg = g_markup_printf_escaped(
(const char *) C_("First parameter is URL, second is error text",
@@ -198,7 +198,7 @@ void rssyl_fetch_feed(RFetchCtx *ctx, RSSylVerboseFlags verbose)
/* We shouldn't do this, since a title is mandatory. */
feed_set_title(ctx->feed, _("Untitled feed"));
log_print(LOG_PROTOCOL,
- _("RSSyl: possibly invalid feed without title at %s.\n"),
+ _("RSSyl: Possibly invalid feed without title at %s.\n"),
feed_get_url(ctx->feed));
}
}
@@ -312,10 +312,10 @@ gboolean rssyl_update_feed(RFolderItem *ritem, RSSylVerboseFlags verbose)
rssyl_deleted_update(ritem);
- debug_print("RSSyl: starting to parse feed\n");
+ debug_print("RSSyl: STARTING TO PARSE FEED\n");
if( ctx->success && !(ctx->success = rssyl_parse_feed(ritem, ctx->feed)) ) {
/* both libcurl and libfeed were happy, but we weren't */
- debug_print("RSSyl: error processing feed\n");
+ debug_print("RSSyl: Error processing feed\n");
if( verbose & RSSYL_SHOW_ERRORS ) {
gchar *msg = g_markup_printf_escaped(
(const char *) _("Couldn't process feed at\n<b>%s</b>\n\n"
@@ -328,7 +328,7 @@ gboolean rssyl_update_feed(RFolderItem *ritem, RSSylVerboseFlags verbose)
log_error(LOG_PROTOCOL, RSSYL_LOG_ERROR_PROC, ctx->feed->url);
}
- debug_print("RSSyl: feed parsed\n");
+ debug_print("RSSyl: FEED PARSED\n");
STATUSBAR_POP(mainwin);
@@ -368,18 +368,18 @@ static gboolean rssyl_update_recursively_func(GNode *node, gpointer data, gboole
ritem = (RFolderItem *)item;
if( ritem->url != NULL ) {
- debug_print("RSSyl: %s refresh'\n", manual_refresh ? "manual" : "automated");
+ debug_print("RSSyl: %s refresh'\n", manual_refresh ? "Manual" : "Automated");
if((manual_refresh == FALSE) &&
rssyl_prefs_get()->refresh_all_skips &&
(ritem->default_refresh_interval == FALSE) &&
(ritem->refresh_interval == 0)) {
- debug_print("RSSyl: skipping feed '%s'\n", item->name);
+ debug_print("RSSyl: Skipping feed '%s'\n", item->name);
} else {
- debug_print("RSSyl: updating feed '%s'\n", item->name);
+ debug_print("RSSyl: Updating feed '%s'\n", item->name);
rssyl_update_feed(ritem, 0);
}
} else
- debug_print("RSSyl: updating in folder '%s'\n", item->name);
+ debug_print("RSSyl: Updating in folder '%s'\n", item->name);
return FALSE;
}
@@ -400,7 +400,7 @@ void rssyl_update_recursively(FolderItem *item, gboolean manual_refresh)
g_return_if_fail(item->folder != NULL);
g_return_if_fail(item->folder->klass == rssyl_folder_get_class());
- debug_print("RSSyl: recursively updating '%s'\n", item->name);
+ debug_print("RSSyl: Recursively updating '%s'\n", item->name);
g_node_traverse(item->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
manual_refresh ? rssyl_update_recursively_manually_func : rssyl_update_recursively_automated_func,
diff --git a/src/plugins/rssyl/rssyl_update_format.c b/src/plugins/rssyl/rssyl_update_format.c
index 2c72795c2..b9f4c1b6a 100644
--- a/src/plugins/rssyl/rssyl_update_format.c
+++ b/src/plugins/rssyl/rssyl_update_format.c
@@ -197,7 +197,7 @@ void rssyl_update_format()
return;
}
- debug_print("RSSyl: old format found, updating.\n");
+ debug_print("RSSyl: Old format found, updating.\n");
oldfeeds = rssyl_old_feed_metadata_parse(old_feeds_xml);
@@ -228,7 +228,7 @@ void rssyl_update_format()
g_free(ctx);
if (g_remove(old_feeds_xml) != 0) {
- debug_print("RSSyl: couldn't delete '%s'\n", old_feeds_xml);
+ debug_print("RSSyl: Couldn't delete '%s'\n", old_feeds_xml);
}
g_free(old_feeds_xml);
}
diff --git a/src/plugins/spam_report/spam_report.c b/src/plugins/spam_report/spam_report.c
index a83d40420..6868b834f 100644
--- a/src/plugins/spam_report/spam_report.c
+++ b/src/plugins/spam_report/spam_report.c
@@ -156,13 +156,13 @@ static void spamreport_http_response_log(gchar *url, long response)
{
switch (response) {
case 400: /* Bad Request */
- log_error(LOG_PROTOCOL, "%s: bad Request\n", url);
+ log_error(LOG_PROTOCOL, "%s: Bad Request\n", url);
break;
case 401: /* Not Authorized */
- log_error(LOG_PROTOCOL, "%s: wrong login or password\n", url);
+ log_error(LOG_PROTOCOL, "%s: Wrong login or password\n", url);
break;
case 404: /* Not Authorized */
- log_error(LOG_PROTOCOL, "%s: not found\n", url);
+ log_error(LOG_PROTOCOL, "%s: Not found\n", url);
break;
}
}
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list