commit 57a202253545bd8792fc93c3ff486c7a0c93c590
parent b33153adc3280324c7ca3b356afe24509788fbb2
Author: paul <paul@claws-mail.org>
Date: Tue, 9 Mar 2021 09:28:04 +0000
CAN_USE_EXTERNAL_EDITOR is no longer used
Diffstat:
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -1715,7 +1715,6 @@ const gchar *prefs_common_get_uri_cmd(void)
#endif
}
-#ifdef CAN_USE_EXTERNAL_EDITOR
const gchar *prefs_common_get_ext_editor_cmd(void)
{
return prefs_common.ext_editor_cmd;
@@ -1734,7 +1733,6 @@ const gchar *prefs_common_get_ext_editor_cmd(void)
return "xdg-open %s";
#endif /* 0 */
}
-#endif /* CAN_USE_EXTERNAL_EDITOR */
gboolean prefs_common_get_use_shred(void)
{
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2018 Colin Leroy <colin@colino.net> & The Claws Mail Team
+ * Copyright (C) 2005-2021 the Claws Mail Team and Colin Leroy <colin@colino.net>
*
* 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
@@ -51,9 +51,7 @@ typedef struct _WritingPage
GtkWidget *window;
-#ifdef CAN_USE_EXTERNAL_EDITOR
GtkWidget *checkbtn_autoextedit;
-#endif /* CAN_USE_EXTERNAL_EDITOR */
GtkWidget *checkbtn_reply_account_autosel;
GtkWidget *checkbtn_forward_account_autosel;
GtkWidget *checkbtn_reedit_account_autosel;
@@ -77,11 +75,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
GtkWidget *vbox1;
GtkWidget *vbox2;
-
-#ifdef CAN_USE_EXTERNAL_EDITOR
GtkWidget *checkbtn_autoextedit;
-#endif /* CAN_USE_EXTERNAL_EDITOR */
-
GtkWidget *frame;
GtkWidget *hbox_autosel;
GtkWidget *checkbtn_reply_account_autosel;
@@ -143,11 +137,9 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
/* Editing */
vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Editing"));
-#ifdef CAN_USE_EXTERNAL_EDITOR
/* Editing: automatically start the text editor */
PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit,
_("Automatically launch the external editor"));
-#endif /* CAN_USE_EXTERNAL_EDITOR */
/* Editing: automatically save draft */
hbox_autosave = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
@@ -263,10 +255,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
SET_TOGGLE_SENSITIVITY (checkbtn_warn_large_insert, spinbtn_warn_large_insert_size);
SET_TOGGLE_SENSITIVITY (checkbtn_warn_large_insert, label_warn_large_insert_size);
-#ifdef CAN_USE_EXTERNAL_EDITOR
prefs_writing->checkbtn_autoextedit = checkbtn_autoextedit;
-#endif /* CAN_USE_EXTERNAL_EDITOR */
-
prefs_writing->checkbtn_reply_account_autosel = checkbtn_reply_account_autosel;
prefs_writing->checkbtn_forward_account_autosel = checkbtn_forward_account_autosel;
prefs_writing->checkbtn_reedit_account_autosel = checkbtn_reedit_account_autosel;
@@ -289,10 +278,8 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
prefs_writing->optmenu_dnd_insert_or_attach = optmenu_dnd_insert_or_attach;
-#ifdef CAN_USE_EXTERNAL_EDITOR
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_autoextedit),
prefs_common.auto_exteditor);
-#endif /* CAN_USE_EXTERNAL_EDITOR */
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_forward_as_attachment),
prefs_common.forward_as_attachment);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_redirect_keep_from),
@@ -329,10 +316,8 @@ static void prefs_compose_writing_save(PrefsPage *_page)
{
WritingPage *page = (WritingPage *) _page;
-#ifdef CAN_USE_EXTERNAL_EDITOR
prefs_common.auto_exteditor =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_autoextedit));
-#endif /* CAN_USE_EXTERNAL_EDITOR */
prefs_common.forward_as_attachment =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_forward_as_attachment));
prefs_common.redirect_keep_from =
diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 2004-2021 the Claws Mail team and Hiroyuki Yamamoto
*
* 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
@@ -55,10 +55,8 @@ typedef struct _ExtProgPage
#endif /* !G_OS_WIN32 */
GtkWidget *exteditor_label;
-#ifdef CAN_USE_EXTERNAL_EDITOR
GtkWidget *exteditor_combo;
GtkWidget *exteditor_entry;
-#endif /* CAN_USE_EXTERNAL_EDITOR */
GtkWidget *astextviewer_label;
GtkWidget *astextviewer_entry;
@@ -79,12 +77,9 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *uri_combo;
GtkWidget *uri_entry;
#endif /* !G_OS_WIN32 */
-
-#ifdef CAN_USE_EXTERNAL_EDITOR
GtkWidget *exteditor_label;
GtkWidget *exteditor_combo;
GtkWidget *exteditor_entry;
-#endif /* CAN_USE_EXTERNAL_EDITOR */
GtkWidget *astextviewer_label;
GtkWidget *astextviewer_entry;
@@ -174,7 +169,6 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_entry_set_text(GTK_ENTRY(uri_entry), prefs_common.uri_cmd ? prefs_common.uri_cmd : "");
#endif /* !G_OS_WIN32 */
-#ifdef CAN_USE_EXTERNAL_EDITOR
exteditor_label = gtk_label_new (_("Text editor"));
gtk_widget_show(exteditor_label);
@@ -203,7 +197,6 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
exteditor_entry = gtk_bin_get_child(GTK_BIN((exteditor_combo)));
gtk_entry_set_text(GTK_ENTRY(exteditor_entry),
prefs_common.ext_editor_cmd ? prefs_common.ext_editor_cmd : "");
-#endif /* CAN_USE_EXTERNAL_EDITOR */
astextviewer_label = gtk_label_new(_("Command for 'Display as text'"));
gtk_widget_show(astextviewer_label);
