aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--data/Makefile.am6
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp2
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 69a21e8ef..c5943e373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-09 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * data/Makefile.am:
+
+ Fix schemas build.
+
+ * embed/mozilla/mozilla-embed-persist.cpp:
+
+ Api change grrrr.
+
2003-01-09 Lee Willis <lwillis@plus.net>
* embed/mozilla/FilePicker.cpp:
diff --git a/data/Makefile.am b/data/Makefile.am
index 452cdd623..141762d4c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = ui art glade starthere
@INTLTOOL_SERVER_RULE@
@INTLTOOL_DESKTOP_RULE@
+@INTLTOOL_SCHEMAS_RULE@
server_in_files = GNOME_Epiphany_Automation.server.in GNOME_Epiphany_NautilusView.server.in
server_DATA = GNOME_Epiphany_Automation.server GNOME_Epiphany_NautilusView.server
@@ -14,6 +15,7 @@ Applicationsdir = $(datadir)/applications
Applications_DATA = $(DESKTOP_FILES)
schemadir = $(sysconfdir)/gconf/schemas
+schema_in_files = epiphany.schemas.in
schema_DATA = epiphany.schemas
EXTRA_DIST = $(glade_DATA)
@@ -25,9 +27,9 @@ install-data-local:
done \
fi
-CLEANFILES = $(server_DATA) $(Applications_DATA)
+CLEANFILES = $(server_DATA) $(Applications_DATA) $(schema_DATA)
EXTRA_DIST = $(server_in_files) \
- $(schema_DATA) \
+ $(schema_in_files) \
$(DESKTOP_IN_FILES)
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 9f9ac185c..3453f18cd 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -236,7 +236,7 @@ impl_save (EphyEmbedPersist *persist)
persist,
!(flags & EMBED_PERSIST_SHOW_PROGRESS));
- rv = bpersist->SaveURI (linkURI, nsnull, file);
+ rv = bpersist->SaveURI (linkURI, nsnull, nsnull, nsnull, nsnull, file);
if (NS_FAILED(rv)) return G_FAILED;
}