commit 7f51cf2862944b28bb1a0423f2d4279c537a5a82
parent bf870237c0ebf81df8cff7f0b5f6b93326603619
Author: Paul <paul@claws-mail.org>
Date: Sun, 30 Mar 2025 11:37:59 +0100
hyphenate User-Agent as is done elsewhere
Diffstat:
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
@@ -326,7 +326,7 @@ static void rssyl_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
/* (bool) Verify SSL peer */
if( !strcmp(attr->name, "ssl_verify_peer"))
ritem->ssl_verify_peer = (atoi(attr->value) == 0 ? FALSE : TRUE );
- /* User Agent */
+ /* User-Agent */
if( !strcmp(attr->name, "use_default_user_agent"))
ritem->use_default_user_agent = (atoi(attr->value) == 0 ? FALSE : TRUE );
if( !strcmp(attr->name, "specific_user_agent")) {
@@ -387,7 +387,7 @@ static XMLTag *rssyl_item_get_xml(Folder *folder, FolderItem *item)
/* (bool) Verify SSL peer */
xml_tag_add_attr(tag, xml_attr_new("ssl_verify_peer",
(ri->ssl_verify_peer ? "1" : "0")) );
- /* User Agent */
+ /* User-Agent */
xml_tag_add_attr(tag, xml_attr_new("use_default_user_agent",
(ri->use_default_user_agent ? "1" : "0")) );
if( ri->specific_user_agent != NULL )
@@ -997,7 +997,7 @@ static void rssyl_copy_private_data(Folder *folder, FolderItem *oldi,
newitem->fetching_comments = olditem->fetching_comments;
newitem->last_update = olditem->last_update;
- /* User Agent */
+ /* User-Agent */
newitem->use_default_user_agent = olditem->use_default_user_agent;
if (olditem->specific_user_agent != NULL) {
g_free(newitem->specific_user_agent);
diff --git a/src/plugins/rssyl/rssyl_feed.h b/src/plugins/rssyl/rssyl_feed.h
@@ -27,7 +27,7 @@
#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_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")
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
@@ -125,7 +125,7 @@ static void rssyl_gtk_prop_store(RFolderItem *ritem)
ritem->ssl_verify_peer = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(ritem->feedprop->ssl_verify_peer));
- /* User Agent */
+ /* User-Agent */
use_default_user_agent = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(ritem->feedprop->use_default_user_agent));
ritem->use_default_user_agent = use_default_user_agent;
@@ -374,9 +374,9 @@ void rssyl_gtk_prop(RFolderItem *ritem)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(feedprop->ssl_verify_peer),
ritem->ssl_verify_peer);
- /* User Agent */
+ /* User-Agent */
feedprop->use_default_user_agent = gtk_check_button_new_with_mnemonic(
- _("Use default User Agent"));
+ _("Use default User-Agent"));
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(feedprop->use_default_user_agent),
ritem->use_default_user_agent);
@@ -497,25 +497,25 @@ void rssyl_gtk_prop(RFolderItem *ritem)
gtk_container_add(GTK_CONTAINER(frame), inner_vbox);
inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 7);
- /* Use default User Agent - checkbutton */
+ /* Use default User-Agent - checkbutton */
gtk_box_pack_start(GTK_BOX(inner_vbox), feedprop->use_default_user_agent, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(feedprop->use_default_user_agent), "toggled",
G_CALLBACK(rssyl_feedprop_togglebutton_toggled_cb),
(gpointer)feedprop);
- /* User Agent - label */
+ /* User-Agent - label */
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 7);
- label = gtk_label_new(_("User Agent"));
+ label = gtk_label_new(_("User-Agent"));
gtk_widget_set_tooltip_text(feedprop->use_default_user_agent,
- _("Disable this to use a User Agent specific to this feed"));
+ _("Disable this to use a User-Agent specific to this feed"));
gtk_widget_set_tooltip_text(feedprop->specific_user_agent,
- _("Specific User Agent to use for this feed. If empty, the User Agent string set in '/Configuration/Preferences/Plugins/RSSyl' will be used"));
+ _("Specific User-Agent to use for this feed. If empty, the User-Agent string set in '/Configuration/Preferences/Plugins/RSSyl' will be used"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), feedprop->specific_user_agent, FALSE, FALSE, 0);
gtk_widget_set_sensitive(feedprop->specific_user_agent,
!ritem->use_default_user_agent);
gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0);
- PACK_FRAME (vbox, frame, _("User Agent"));
+ PACK_FRAME (vbox, frame, _("User-Agent"));
gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 7);
gtk_container_add(GTK_CONTAINER(frame), inner_vbox);
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
@@ -231,9 +231,9 @@ static void create_rssyl_prefs_page(PrefsPage *page,
gtk_box_pack_start(GTK_BOX(user_agent_hbox), label, FALSE, FALSE, 0);
use_custom_user_agent = gtk_check_button_new_with_label(
- _("Use a custom User Agent"));
+ _("Use a custom User-Agent"));
gtk_widget_set_tooltip_text(use_custom_user_agent,
- _("Instead of using the default User Agent for feed retrieval, you can enter a custom value"));
+ _("Instead of using the default User-Agent for feed retrieval, you can enter a custom value"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(use_custom_user_agent),
rssyl_prefs.use_custom_user_agent);
gtk_box_pack_start(GTK_BOX(user_agent_hbox), use_custom_user_agent, FALSE, FALSE, 0);
@@ -242,7 +242,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
gtk_entry_set_text(GTK_ENTRY(custom_user_agent), rssyl_prefs.custom_user_agent);
gtk_box_pack_start(GTK_BOX(user_agent_hbox), custom_user_agent, TRUE, TRUE, 0);
gtk_widget_set_tooltip_text(custom_user_agent,
- _("Custom User Agent to use for feed retrieval. If empty, the default User Agent string will be used"));
+ _("Custom User-Agent to use for feed retrieval. If empty, the default User-Agent string will be used"));
g_signal_connect(G_OBJECT(use_custom_user_agent), "toggled",
G_CALLBACK(rssyl_use_custom_user_agent_toggled_cb), custom_user_agent);
@@ -259,7 +259,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 6);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
- PACK_FRAME (vbox, frame, _("User Agent"));
+ PACK_FRAME (vbox, frame, _("User-Agent"));
gtk_container_set_border_width(GTK_CONTAINER(vbox3), 6);
gtk_container_add(GTK_CONTAINER(frame), vbox3);
diff --git a/src/plugins/rssyl/rssyl_update_feed.c b/src/plugins/rssyl/rssyl_update_feed.c
@@ -66,7 +66,7 @@ gchar *rssyl_get_user_agent(RFolderItem *ritem)
if (strlen(specific) > 0)
user_agent = specific;
else
- debug_print("RSSyl: feed-specific User Agent is empty, trying custom value from global prefs\n");
+ debug_print("RSSyl: feed-specific User-Agent is empty, trying custom value from global prefs\n");
}
/* fallback to user agent value from preferences (if enabled and set) */
@@ -77,15 +77,15 @@ gchar *rssyl_get_user_agent(RFolderItem *ritem)
if (strlen(custom) > 0)
user_agent = custom;
else
- debug_print("RSSyl: custom User Agent is empty, assuming default value\n");
+ debug_print("RSSyl: custom User-Agent is empty, assuming default value\n");
}
}
- /* fallback to default User Agent */
+ /* fallback to default User-Agent */
if (user_agent == NULL)
user_agent = g_strdup_printf("ClawsMailRSSyl/%s (%s)", (gchar *)plugin_version(), HOMEPAGE_URI);
- debug_print("RSSyl: User Agent is %s\n", user_agent);
+ debug_print("RSSyl: User-Agent is %s\n", user_agent);
return user_agent;
}
