diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-04-18 21:21:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-04-18 21:54:06 +0800 |
| commit | 5e356995407fd947625b0913bdc739c7eed65f9d (patch) | |
| tree | e68098b3898478b04320e10e2610b2b326c9ed49 | |
| parent | 7002738a5960af30894859b30984aa0e98b948d0 (diff) | |
| download | gsoc2013-evolution-5e356995407fd947625b0913bdc739c7eed65f9d.tar gsoc2013-evolution-5e356995407fd947625b0913bdc739c7eed65f9d.tar.gz gsoc2013-evolution-5e356995407fd947625b0913bdc739c7eed65f9d.tar.bz2 gsoc2013-evolution-5e356995407fd947625b0913bdc739c7eed65f9d.tar.lz gsoc2013-evolution-5e356995407fd947625b0913bdc739c7eed65f9d.tar.xz gsoc2013-evolution-5e356995407fd947625b0913bdc739c7eed65f9d.tar.zst gsoc2013-evolution-5e356995407fd947625b0913bdc739c7eed65f9d.zip | |
Use newer GTK+ API to manage print settings.
| -rw-r--r-- | 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 8faeafc0f5..6e5afd05f7 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); } |