[Commits] [SCM] claws branch, master, updated. 3.17.3-121-g299b18f

[wwp at claws-mail.org]

The branch, master has been updated
       via  299b18fb4b0c5381af7017421367fe8fa8f82c68 (commit)
      from  c638bc23018a4333aecea5b0b362d9d4a99d6092 (commit)

Summary of changes:
 src/plugins/fancy/fancy_prefs.c  |    4 ++--
 src/plugins/fancy/fancy_viewer.c |    5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 299b18fb4b0c5381af7017421367fe8fa8f82c68
Author: wwp <subscript at free.fr>
Date:   Tue Mar 5 12:57:15 2019 +0100

    Review label of webkit menu items in Fancy: remove the '(enable
    remote content)' not-so-clear mention, and capitalize words to
    follow other labels.

diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index 7c553ba..3953048 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -167,7 +167,7 @@ static void remote_content_set_labels_cb(GtkWidget *button, FancyPrefsPage *pref
 	if (gtk_tree_model_get_iter_first (model, &iter)) {
 		if (remote_enabled)
 			gtk_list_store_set(GTK_LIST_STORE(model), &iter, COMBOBOX_TEXT,
-					   _("Open in viewer (remote content is enabled)"), -1);
+					   _("Open in Viewer (remote content is enabled)"), -1);
 		else
 			gtk_list_store_set(GTK_LIST_STORE(model), &iter, COMBOBOX_TEXT,
 					   _("Do nothing (remote content is disabled)"), -1);
@@ -282,7 +282,7 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	GtkTreeIter iter;
 
 	COMBOBOX_ADD (menu, "DEFAULT_ACTION", FALSE);
-	COMBOBOX_ADD (menu, _("Open in external browser"), TRUE);
+	COMBOBOX_ADD (menu, _("Open in External Browser"), TRUE);
 
 	gtk_box_pack_start(GTK_BOX(hbox_ext), open_external_label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox_ext), optmenu_open_external, FALSE, FALSE, 0);
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index a6eddb2..ba3271b 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -747,10 +747,7 @@ static void viewer_menu_handler(GtkWidget *menuitem, FancyViewer *viewer)
 		if (!g_ascii_strcasecmp(gtk_label_get_text(GTK_LABEL(menul)),
 					"Open Link" )) {
 
-			if (viewer->override_prefs_remote_content)
-				gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer"));
-			else
-				gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer (enable remote content)"));
+			gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer"));
 
 			GtkImageMenuItem *m_new = GTK_IMAGE_MENU_ITEM(menuitem);
 			gtk_widget_set_sensitive(GTK_WIDGET(m_new), viewer->override_prefs_remote_content);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail