[balsa] sendmsg-window: MR gtk!236 has been merged
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] sendmsg-window: MR gtk!236 has been merged
- Date: Sat, 21 Jul 2018 21:30:30 +0000 (UTC)
commit ac51e35c2f0c53a45fb51613f484411180601751
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sat Jul 21 17:27:59 2018 -0400
sendmsg-window: MR gtk!236 has been merged
Oops, forgot this in the previous commit.
* src/sendmsg-window.c (create_text_area): MR gtk!236 has been merged;
the fix will be in Gtk 3.24 when it is released, but for building
against unstable versions the test is GTK_CHECK_VERSION(3, 23, 1).
ChangeLog | 9 +++++++++
src/sendmsg-window.c | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 653e99f1f..e5046970e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-07-21 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Oops, forgot this in the previous commit.
+
+ * src/sendmsg-window.c (create_text_area): MR
+ gtk!236 has been merged; the fix will be in Gtk 3.24 when it
+ is released, but for building against unstable versions the
+ test is GTK_CHECK_VERSION(3, 23, 1).
+
2018-07-20 Peter Bloomfield <pbloomfield bellsouth net>
* src/balsa-mime-widget-text.c (balsa_mime_widget_new_text): MR
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index ec380387d..4efe6f1f2 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -2871,15 +2871,15 @@ create_text_area(BalsaSendmsg * bsmsg)
bsmsg->text = gtk_text_view_new();
#endif /* HAVE_GTKSOURCEVIEW */
text_view = GTK_TEXT_VIEW(bsmsg->text);
-#if GTK_MR_236_IS_MERGED
+#if GTK_CHECK_VERSION(3, 23, 1)
gtk_text_view_set_left_margin(text_view, 2);
gtk_text_view_set_right_margin(text_view, 2);
-#else /* GTK_MR_236_IS_MERGED */
+#else /* GTK_CHECK_VERSION(3, 23, 1) */
gtk_text_view_set_left_margin(text_view, 0);
gtk_text_view_set_right_margin(text_view, 0);
gtk_widget_set_margin_start(bsmsg->text, 2);
gtk_widget_set_margin_end(bsmsg->text, 2);
-#endif /* GTK_MR_236_IS_MERGED */
+#endif /* GTK_CHECK_VERSION(3, 23, 1) */
/* set the message font */
if (!balsa_app.use_system_fonts) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]