[epiphany] embed-shell: should be safe to drop the legacy print setup code now



commit 41840e57e609ed225609ae7eac7530f60bf10528
Author: Xan Lopez <xan igalia com>
Date:   Sat Sep 8 15:24:24 2012 +0200

    embed-shell: should be safe to drop the legacy print setup code now

 doc/reference/Makefile.am |    1 -
 embed/ephy-embed-shell.c  |   20 ----
 lib/Makefile.am           |    2 -
 lib/ephy-print-utils.c    |  269 ---------------------------------------------
 lib/ephy-print-utils.h    |   48 --------
 5 files changed, 0 insertions(+), 340 deletions(-)
---
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 72cf06c..ff628ab 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -38,7 +38,6 @@ IGNORE_HFILES = \
 	ephy-node-filter.h \
 	ephy-node.h \
 	ephy-prefs.h \
-	ephy-print-utils.h \
 	ephy-state.h \
 	ephy-stock-icons.h \
 	ephy-string.h \
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index e5c41d7..4dad56a 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);
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8d0dca2..62508b1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,7 +20,6 @@ NOINST_H_FILES = \
 	ephy-object-helpers.h			\
 	ephy-prefs.h				\
 	ephy-profile-utils.h			\
-	ephy-print-utils.h			\
 	ephy-shlib-loader.h			\
 	ephy-signal-accumulator.h		\
 	ephy-smaps.h				\
@@ -64,7 +63,6 @@ libephymisc_la_SOURCES = \
 	ephy-prefs.h				\
 	ephy-profile-utils.c			\
 	ephy-profile-utils.h			\
-	ephy-print-utils.c			\
 	ephy-settings.c				\
 	ephy-shlib-loader.c			\
 	ephy-signal-accumulator.c		\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]