[evolution/gnome-2-30] Use newer GTK+ API to manage print settings.

[Matthew Barnes <mbarnes src gnome org>]

commit 5e356995407fd947625b0913bdc739c7eed65f9d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Apr 18 09:21:36 2010 -0400

    Use newer GTK+ API to manage print settings.

 e-util/e-print.c |   22 ++++++----------------
 1 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/e-util/e-print.c b/e-util/e-print.c
index 8faeafc..6e5afd0 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -92,17 +92,12 @@ load_settings (GKeyFile *key_file)
 	GtkPrintSettings *settings;
 	GError *error = NULL;
 
-	/* XXX Use gtk_print_settings_load_key_file() here once
-	 *     GTK+ 2.14 becomes available. */
+	settings = gtk_print_settings_new ();
 
-	if (!g_key_file_has_group (key_file, PRINT_SETTINGS_GROUP_NAME))
-		return gtk_print_settings_new ();
-
-	settings = gtk_print_settings_new_from_key_file (
-		key_file, NULL, &error);
+	gtk_print_settings_load_key_file (
+		settings, key_file, PRINT_SETTINGS_GROUP_NAME, &error);
 
 	if (error != NULL) {
-		settings = gtk_print_settings_new ();
 		g_warning ("%s", error->message);
 		g_error_free (error);
 	}
@@ -123,17 +118,12 @@ load_page_setup (GKeyFile *key_file)
 	GtkPageSetup *page_setup;
 	GError *error = NULL;
 
-	/* XXX Use gtk_page_setup_load_key_file() here once
-	 *     GTK+ 2.14 becomes available. */
-
-	if (!g_key_file_has_group (key_file, PAGE_SETUP_GROUP_NAME))
-		return gtk_page_setup_new ();
+	page_setup = gtk_page_setup_new ();
 
-	page_setup = gtk_page_setup_new_from_key_file (
-		key_file, NULL, &error);
+	gtk_page_setup_load_key_file (
+		page_setup, key_file, PAGE_SETUP_GROUP_NAME, &error);
 
 	if (error != NULL) {
-		page_setup = gtk_page_setup_new ();
 		g_warning ("%s", error->message);
 		g_error_free (error);
 	}