aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-09-08 21:24:24 +0800
committerXan Lopez <xan@igalia.com>2012-09-08 21:24:24 +0800
commit41840e57e609ed225609ae7eac7530f60bf10528 (patch)
tree7dee3882425ec26260baa810a480f6b989a986ae /embed
parent8f25e193643306b9faf15f0c1b84014d8352ca4c (diff)
downloadgsoc2013-epiphany-41840e57e609ed225609ae7eac7530f60bf10528.tar
gsoc2013-epiphany-41840e57e609ed225609ae7eac7530f60bf10528.tar.gz
gsoc2013-epiphany-41840e57e609ed225609ae7eac7530f60bf10528.tar.bz2
gsoc2013-epiphany-41840e57e609ed225609ae7eac7530f60bf10528.tar.lz
gsoc2013-epiphany-41840e57e609ed225609ae7eac7530f60bf10528.tar.xz
gsoc2013-epiphany-41840e57e609ed225609ae7eac7530f60bf10528.tar.zst
gsoc2013-epiphany-41840e57e609ed225609ae7eac7530f60bf10528.zip
embed-shell: should be safe to drop the legacy print setup code now
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-shell.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index e5c41d735..4dad56a46 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -31,7 +31,6 @@
#include "ephy-encodings.h"
#include "ephy-file-helpers.h"
#include "ephy-history-service.h"
-#include "ephy-print-utils.h"
#include "ephy-snapshot-service.h"
#include <glib.h>
@@ -43,8 +42,6 @@
#define PAGE_SETUP_FILENAME "page-setup-gtk.ini"
#define PRINT_SETTINGS_FILENAME "print-settings.ini"
-#define LEGACY_PAGE_SETUP_FILENAME "page-setup.ini"
-
#define EPHY_EMBED_SHELL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_EMBED_SHELL, EphyEmbedShellPrivate))
#define ENABLE_MIGRATION
@@ -472,23 +469,6 @@ ephy_embed_shell_get_page_setup (EphyEmbedShell *shell)
priv->page_setup = gtk_page_setup_new_from_file (path, &error);
g_free (path);
-#ifdef ENABLE_MIGRATION
- /* If the file doesn't exist, try to fall back to the old format */
- if (error != NULL &&
- error->domain == G_FILE_ERROR &&
- error->code == G_FILE_ERROR_NOENT)
- {
- path = g_build_filename (ephy_dot_dir (), LEGACY_PAGE_SETUP_FILENAME, NULL);
- priv->page_setup = ephy_print_utils_page_setup_new_from_file (path, NULL);
- if (priv->page_setup != NULL) {
- /* Delete the old file, so we don't migrate again */
- g_unlink (path);
- }
- g_free (path);
- } else if (error != NULL)
- g_warning ("error: %s\n", error->message);
-#endif /* ENABLE_MIGRATION */
-
if (error)
g_error_free (error);