aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--embed/ephy-embed-shell.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 08f519785..abef3bbcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-08-05 Christian Persch <chpe@cvs.gnome.org>
+ * embed/ephy-embed-shell.c: (ephy_embed_shell_set_page_setup),
+ (ephy_embed_shell_set_print_settings):
+
+ Fix the build.
+
+2006-08-05 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-window.c:
Remove accel for ViewToolbar. Bug #328783.
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 9a40d7c6b..b15b96c23 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -417,7 +417,7 @@ ephy_embed_shell_get_page_setup (EphyEmbedShell *shell)
char *path;
path = g_build_filename (ephy_dot_dir (), PAGE_SETUP_FILENAME, NULL);
- priv->page_setup = ephy_print_utils_page_setup_new_from_file (path, &error);
+ priv->page_setup = ephy_print_utils_page_setup_new_from_file (path, NULL);
g_free (path);
if (priv->page_setup == NULL)
@@ -469,7 +469,7 @@ ephy_embed_shell_get_print_settings (EphyEmbedShell *shell)
char *path;
path = g_build_filename (ephy_dot_dir (), PRINT_SETTINGS_FILENAME, NULL);
- priv->print_settings = ephy_print_utils_settings_new_from_file (path, &error);
+ priv->print_settings = ephy_print_utils_settings_new_from_file (path, NULL);
g_free (path);
if (priv->print_settings == NULL)