[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-849-g2053f3014
paul at claws-mail.org
paul at claws-mail.org
Thu Nov 21 15:07:49 CET 2019
The branch, gtk3 has been updated
via 2053f301428b2ebfafde1551800911700432ddcc (commit)
from 853324b001eb29e87c71e9fab6f4ad8b2ce18e49 (commit)
Summary of changes:
src/action.c | 2 +-
src/alertpanel.c | 2 +-
src/compose.c | 2 +-
src/folderview.c | 2 +-
src/gtk/gtkaspell.c | 2 +-
src/gtk/gtkutils.c | 4 ++--
src/gtk/inputdialog.c | 2 +-
src/headerview.c | 22 +++++++++++-----------
src/messageview.c | 4 ++--
src/password_gtk.c | 2 +-
src/plugins/managesieve/sieve_editor.c | 2 +-
src/plugins/python/python-shell.c | 2 +-
src/plugins/vcalendar/vcalendar.c | 2 +-
src/prefs_template.c | 2 +-
src/quote_fmt.c | 6 +++---
src/sourcewindow.c | 4 ++--
src/summaryview.c | 8 ++++----
src/textview.c | 4 ++--
18 files changed, 37 insertions(+), 37 deletions(-)
- Log -----------------------------------------------------------------
commit 2053f301428b2ebfafde1551800911700432ddcc
Author: paul <paul at claws-mail.org>
Date: Thu Nov 21 15:07:45 2019 +0000
replace deprecated gtk_widget_modify_font()
diff --git a/src/action.c b/src/action.c
index afb1556e2..55552aabb 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1338,7 +1338,7 @@ static void create_io_dialog(Children *children)
font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc) {
- gtk_widget_modify_font(text, font_desc);
+ gtk_widget_override_font(text, font_desc);
pango_font_description_free(font_desc);
}
}
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 22cc41dbf..a530c8e2b 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -318,7 +318,7 @@ static void alertpanel_create(const gchar *title,
(font_desc, size * PANGO_SCALE_LARGE);
}
if (font_desc)
- gtk_widget_modify_font(label, font_desc);
+ gtk_widget_override_font(label, font_desc);
g_free(title_full);
label = gtk_label_new(message);
diff --git a/src/compose.c b/src/compose.c
index 52180d598..187981d76 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -8165,7 +8165,7 @@ static Compose *compose_create(PrefsAccount *account,
font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc) {
- gtk_widget_modify_font(text, font_desc);
+ gtk_widget_override_font(text, font_desc);
pango_font_description_free(font_desc);
}
}
diff --git a/src/folderview.c b/src/folderview.c
index e8a7aad5a..2e362a4b4 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -660,7 +660,7 @@ static void folderview_set_fonts(FolderView *folderview)
font_desc = pango_font_description_from_string(NORMAL_FONT);
if (font_desc) {
- gtk_widget_modify_font(ctree, font_desc);
+ gtk_widget_override_font(ctree, font_desc);
pango_font_description_free(font_desc);
}
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index dac72dc17..2ebe0c8e1 100644
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -1489,7 +1489,7 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
(font_desc, size * PANGO_SCALE_LARGE);
}
if (font_desc)
- gtk_widget_modify_font(label, font_desc);
+ gtk_widget_override_font(label, font_desc);
g_free(thelabel);
entry = gtk_entry_new();
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 5fd1fd34a..063bb4c7a 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -121,11 +121,11 @@ void gtkut_widget_set_small_font_size(GtkWidget *widget)
font_desc = pango_font_description_from_string(NORMAL_FONT);
size = pango_font_description_get_size(font_desc);
pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
- gtk_widget_modify_font(widget, font_desc);
+ gtk_widget_override_font(widget, font_desc);
pango_font_description_free(font_desc);
} else {
font_desc = pango_font_description_from_string(SMALL_FONT);
- gtk_widget_modify_font(widget, font_desc);
+ gtk_widget_override_font(widget, font_desc);
pango_font_description_free(font_desc);
}
}
diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c
index 680cdc885..1f83c92d0 100644
--- a/src/gtk/inputdialog.c
+++ b/src/gtk/inputdialog.c
@@ -343,7 +343,7 @@ static void input_dialog_create(gboolean is_password)
(font_desc, size * PANGO_SCALE_LARGE);
}
if (font_desc)
- gtk_widget_modify_font(msg_title, font_desc);
+ gtk_widget_override_font(msg_title, font_desc);
msg_label = gtk_label_new("");
gtk_label_set_xalign(GTK_LABEL(msg_label), 0.0);
diff --git a/src/headerview.c b/src/headerview.c
index c7a650441..78c5443dc 100644
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 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
@@ -151,11 +151,11 @@ void headerview_set_font(HeaderView *headerview)
normalfont = pango_font_description_from_string(NORMAL_FONT);
if (normalfont) {
- gtk_widget_modify_font(headerview->from_body_label, normalfont);
- gtk_widget_modify_font(headerview->to_body_label, normalfont);
- gtk_widget_modify_font(headerview->ng_body_label, normalfont);
- gtk_widget_modify_font(headerview->subject_body_label, normalfont);
- gtk_widget_modify_font(headerview->tags_body_label, normalfont);
+ gtk_widget_override_font(headerview->from_body_label, normalfont);
+ gtk_widget_override_font(headerview->to_body_label, normalfont);
+ gtk_widget_override_font(headerview->ng_body_label, normalfont);
+ gtk_widget_override_font(headerview->subject_body_label, normalfont);
+ gtk_widget_override_font(headerview->tags_body_label, normalfont);
pango_font_description_free(normalfont);
}
@@ -166,11 +166,11 @@ void headerview_set_font(HeaderView *headerview)
boldfont = pango_font_description_from_string(BOLD_FONT);
}
if (boldfont) {
- gtk_widget_modify_font(headerview->from_header_label, boldfont);
- gtk_widget_modify_font(headerview->to_header_label, boldfont);
- gtk_widget_modify_font(headerview->ng_header_label, boldfont);
- gtk_widget_modify_font(headerview->subject_header_label, boldfont);
- gtk_widget_modify_font(headerview->tags_header_label, boldfont);
+ gtk_widget_override_font(headerview->from_header_label, boldfont);
+ gtk_widget_override_font(headerview->to_header_label, boldfont);
+ gtk_widget_override_font(headerview->ng_header_label, boldfont);
+ gtk_widget_override_font(headerview->subject_header_label, boldfont);
+ gtk_widget_override_font(headerview->tags_header_label, boldfont);
pango_font_description_free(boldfont);
}
}
diff --git a/src/messageview.c b/src/messageview.c
index b07b55b2e..d05238b02 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 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
@@ -2230,7 +2230,7 @@ void messageview_print(MsgInfo *msginfo, gboolean all_headers,
(prefs_common.textfont);
}
if (font_desc) {
- gtk_widget_modify_font(tmpview->mimeview->textview->text,
+ gtk_widget_override_font(tmpview->mimeview->textview->text,
font_desc);
pango_font_description_free(font_desc);
}
diff --git a/src/password_gtk.c b/src/password_gtk.c
index abe45e990..f65dae42e 100644
--- a/src/password_gtk.c
+++ b/src/password_gtk.c
@@ -159,7 +159,7 @@ void master_passphrase_change_dialog()
(font_desc, size * PANGO_SCALE_LARGE);
}
if (font_desc)
- gtk_widget_modify_font(msg_title, font_desc);
+ gtk_widget_override_font(msg_title, font_desc);
label = gtk_label_new(
_("If a master passphrase is currently active, it\n"
diff --git a/src/plugins/managesieve/sieve_editor.c b/src/plugins/managesieve/sieve_editor.c
index da779d8c2..aeacbf14e 100644
--- a/src/plugins/managesieve/sieve_editor.c
+++ b/src/plugins/managesieve/sieve_editor.c
@@ -610,7 +610,7 @@ MENUITEM_ADDUI_MANAGER(ui_manager, "/Menu/Filter", "Revert", "Filter/Revert", GT
font_desc = pango_font_description_from_string
(prefs_common_get_prefs()->textfont);
if (font_desc) {
- gtk_widget_modify_font(text, font_desc);
+ gtk_widget_override_font(text, font_desc);
pango_font_description_free(font_desc);
}
}
diff --git a/src/plugins/python/python-shell.c b/src/plugins/python/python-shell.c
index 96d009591..7a628deb5 100644
--- a/src/plugins/python/python-shell.c
+++ b/src/plugins/python/python-shell.c
@@ -128,7 +128,7 @@ parasite_python_shell_init(ParasitePythonShell *python_shell)
/* Make the textview monospaced */
font_desc = pango_font_description_from_string("monospace");
pango_font_description_set_size(font_desc, 10 * PANGO_SCALE);
- gtk_widget_modify_font(priv->textview, font_desc);
+ gtk_widget_override_font(priv->textview, font_desc);
pango_font_description_free(font_desc);
/* Create the end-of-buffer mark */
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
index 1dea32e67..f443a09eb 100644
--- a/src/plugins/vcalendar/vcalendar.c
+++ b/src/plugins/vcalendar/vcalendar.c
@@ -857,7 +857,7 @@ static void vcal_viewer_show_mimepart(MimeViewer *_mimeviewer, const gchar *file
font_desc = pango_font_description_from_string
(prefs_common_get_prefs()->textfont);
if (font_desc) {
- gtk_widget_modify_font(
+ gtk_widget_override_font(
vcalviewer->description, font_desc);
pango_font_description_free(font_desc);
}
diff --git a/src/prefs_template.c b/src/prefs_template.c
index c95698aaf..87c773530 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -265,7 +265,7 @@ static void prefs_template_window_create(void)
font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc) {
- gtk_widget_modify_font(text_value, font_desc);
+ gtk_widget_override_font(text_value, font_desc);
pango_font_description_free(font_desc);
}
}
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
index d8838a718..b014ac9b7 100644
--- a/src/quote_fmt.c
+++ b/src/quote_fmt.c
@@ -227,7 +227,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc) {
- gtk_widget_modify_font(text_format, font_desc);
+ gtk_widget_override_font(text_format, font_desc);
pango_font_description_free(font_desc);
}
}
@@ -355,7 +355,7 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc) {
- gtk_widget_modify_font(text_quotefmt, font_desc);
+ gtk_widget_override_font(text_quotefmt, font_desc);
pango_font_description_free(font_desc);
}
}
@@ -484,7 +484,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc) {
- gtk_widget_modify_font(text_fw_quotefmt, font_desc);
+ gtk_widget_override_font(text_fw_quotefmt, font_desc);
pango_font_description_free(font_desc);
}
}
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
index f188c0fb6..a99a02ce2 100644
--- a/src/sourcewindow.c
+++ b/src/sourcewindow.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 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
@@ -100,7 +100,7 @@ SourceWindow *source_window_create(void)
font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc)
- gtk_widget_modify_font(text, font_desc);
+ gtk_widget_override_font(text, font_desc);
gtk_container_add(GTK_CONTAINER(scrolledwin), text);
gtk_widget_show(text);
diff --git a/src/summaryview.c b/src/summaryview.c
index 11e0d1b9a..78d5186db 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -914,7 +914,7 @@ static void summary_set_fonts(SummaryView *summaryview)
font_desc = pango_font_description_from_string(NORMAL_FONT);
if (font_desc) {
- gtk_widget_modify_font(summaryview->ctree, font_desc);
+ gtk_widget_override_font(summaryview->ctree, font_desc);
pango_font_description_free(font_desc);
}
@@ -948,9 +948,9 @@ static void summary_set_fonts(SummaryView *summaryview)
font_desc = pango_font_description_from_string(SMALL_FONT);
}
if (font_desc) {
- gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
- gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
- gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
+ gtk_widget_override_font(summaryview->statlabel_folder, font_desc);
+ gtk_widget_override_font(summaryview->statlabel_select, font_desc);
+ gtk_widget_override_font(summaryview->statlabel_msgs, font_desc);
pango_font_description_free(font_desc);
}
diff --git a/src/textview.c b/src/textview.c
index 59deac0e6..d8d18cc5b 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1785,7 +1785,7 @@ void textview_set_font(TextView *textview, const gchar *codeset)
font_desc = pango_font_description_from_string
(NORMAL_FONT);
if (font_desc) {
- gtk_widget_modify_font(textview->text, font_desc);
+ gtk_widget_override_font(textview->text, font_desc);
CHANGE_TAG_FONT("header", font_desc);
CHANGE_TAG_FONT("hlink", font_desc);
pango_font_description_free(font_desc);
@@ -1811,7 +1811,7 @@ void textview_set_font(TextView *textview, const gchar *codeset)
font_desc = pango_font_description_from_string
(prefs_common.textfont);
if (font_desc) {
- gtk_widget_modify_font(textview->text, font_desc);
+ gtk_widget_override_font(textview->text, font_desc);
pango_font_description_free(font_desc);
}
}
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list