Updatinggnome-2-8-branchpoint

5 files changed, 12 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 82e8826ad..88d5f703d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2004-09-13  Christian Persch  <chpe@cvs.gnome.org>
 
+	* embed/print-dialog.c: (ephy_print_get_print_info):
+
+	Remove accidentally-committed debug g_print output.
+
+	* po/ne.po:
+
+	Remove the offending msgstr; fixes bug #152258.
+
+2004-09-13  Christian Persch  <chpe@cvs.gnome.org>
+
 	* NEWS:
 	* configure.in:
 
diff --git a/data/default-prefs.js b/data/default-prefs.js
index 73d747278..ee659f03a 100644
--- a/data/default-prefs.js
+++ b/data/default-prefs.js
@@ -85,6 +85,3 @@ pref("network.protocol-handler.external.webcal", true);
 // disable xpinstall
 pref("xpinstall.enabled", false);
 
-// disable SSLv2, it has security issues
-pref("security.enable_ssl2", false);
-
diff --git a/embed/Makefile.am b/embed/Makefile.am
index c0001dd9c..91ca67c0d 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -32,6 +32,7 @@ INST_H_FILES = \
 	ephy-cookie-manager.h		\
 	ephy-embed.h			\
 	ephy-embed-event.h		\
+	ephy-embed-factory.h		\
 	ephy-embed-persist.h		\
 	ephy-embed-prefs.h		\
 	ephy-embed-single.h		\
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index baf92744c..c36bd3d8a 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -232,7 +232,7 @@ ephy_print_get_print_info (void)
 		info->file = g_filename_to_utf8 (fname, -1, NULL, NULL, NULL);
 		g_free (fname);
 	}
-g_print (info->file);
+
 	info->printer = eel_gconf_get_string (print_props[PRINTER_PROP].pref);
 
 	info->pages = eel_gconf_get_integer (print_props[ALL_PAGES_PROP].pref);
diff --git a/po/ne.po b/po/ne.po
index 527e8bb41..046effd1a 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1738,20 +1738,6 @@ msgstr "फाईलहरू"
 msgid "Epiphany can't be used now. Mozilla initialization failed. Check your MOZILLA_FIVE_HOME environmental variable."
 msgstr ""
 
-#  *
-#  * This is a comma separated list of language ranges, as specified
-#  * by RFC 2616, 14.4.
-#  * Always include the basic language code last.
-#  *
-#  * Examples:
-#  * "pt"    translation: "pt"
-#  * "pt_BR" translation: "pt-br,pt"
-#  * "zh_CN" translation: "zh-cn,zh"
-#  * "zh_HK" translation: "zh-hk,zh" or maybe "zh-hk,zh-tw,zh"
-#: embed/mozilla/mozilla-notifiers.cpp:736
-msgid "system-language"
-msgstr "नेपाली-नेपाल"
-
 #: embed/print-dialog.c:264
 msgid "Print to"
 msgstr "छाप्न"