aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--data/Makefile.am2
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fdac9e697..23d54cbc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-28 Christian Persch <chpe@svn.gnome.org>
+
+ * data/Makefile.am:
+
+ Fix schemas install command.
+
2007-01-27 Priit Laes <plaes@svn.gnome.org>
* embed/mozilla/EphyAboutModule.cpp:
@@ -14,6 +20,18 @@
2007-01-23 Christian Persch <chpe@svn.gnome.org>
+ * embed/mozilla/EphyBrowser.cpp:
+ * embed/mozilla/GeckoPrintService.cpp:
+ * embed/mozilla/GeckoPrintService.h:
+ * embed/mozilla/GeckoPrintSession.cpp:
+
+ Clear some print settings in the settings we hand to the print job, so
+ they don't get applied twice. Bug #394818.
+
+ Prepare for printing to PDF (#if 0'd until the gecko bug is fixed).
+
+2007-01-23 Christian Persch <chpe@svn.gnome.org>
+
* data/mime-types-permissions.xml:
Add another safe mime type.
diff --git a/data/Makefile.am b/data/Makefile.am
index 27b498aa2..3c21e8cbe 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -60,7 +60,7 @@ install-data-local: $(schema_DATA)
if GCONF_SCHEMAS_INSTALL
if test -z "$(DESTDIR)" ; then \
for p in $^ ; do \
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
done \
fi
endif