From 2418b18a1b0cdd10baec62c300922b4cf941c28c Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Mon, 12 Jun 2017 04:25:22 +0000
Subject: disable save/load of printing settings at GTK+ 2.10.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3558 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog      |  9 +++++++++
 src/printing.c | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 29c60fbe..f54fe5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-06-12
+
+	* version 3.6.0beta1
+
+2017-06-12
+
+	* src/printing.c: disable save/load of printing settings on
+	  GTK+ <= 2.10.
+
 2017-06-09
 
 	* src/printing.c: save/load printing settings and page setup.
diff --git a/src/printing.c b/src/printing.c
index c55bdbe2..bc285a0d 100644
--- a/src/printing.c
+++ b/src/printing.c
@@ -432,6 +432,7 @@ static void draw_page(GtkPrintOperation *operation, GtkPrintContext *context,
 
 static gboolean printing_load_settings(void)
 {
+#if GTK_CHECK_VERSION(2, 12, 0)
 	gchar *file;
 	GtkPrintSettings *new_settings;
 
@@ -456,10 +457,14 @@ static gboolean printing_load_settings(void)
 	settings = new_settings;
 
 	return TRUE;
+#else
+	return FALSE;
+#endif /* GTK_CHECK_VERSION(2, 12, 0) */
 }
 
 static gboolean printing_save_settings(void)
 {
+#if GTK_CHECK_VERSION(2, 12, 0)
 	gchar *file;
 	gboolean ret = TRUE;
 
@@ -475,10 +480,14 @@ static gboolean printing_save_settings(void)
 	g_free(file);
 
 	return ret;
+#else
+	return FALSE;
+#endif /* GTK_CHECK_VERSION(2, 12, 0) */
 }
 
 static gboolean printing_load_page_setup(void)
 {
+#if GTK_CHECK_VERSION(2, 12, 0)
 	gchar *file;
 	GtkPageSetup *new_setup;
 
@@ -503,10 +512,14 @@ static gboolean printing_load_page_setup(void)
 	page_setup = new_setup;
 
 	return TRUE;
+#else
+	return FALSE;
+#endif /* GTK_CHECK_VERSION(2, 12, 0) */
 }
 
 static gboolean printing_save_page_setup(void)
 {
+#if GTK_CHECK_VERSION(2, 12, 0)
 	gchar *file;
 	gboolean ret = TRUE;
 
@@ -522,6 +535,9 @@ static gboolean printing_save_page_setup(void)
 	g_free(file);
 
 	return ret;
+#else
+	return FALSE;
+#endif /* GTK_CHECK_VERSION(2, 12, 0) */
 }
 
 gint printing_print_messages_gtk(GSList *mlist, MimeInfo *partinfo,
-- 
cgit v1.2.3