summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--configure.in1
-rw-r--r--libnautilus-private/nautilus-global-preferences.c2
-rw-r--r--nautilus.spec.in1
4 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 21fc5e0dc..db5b91109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-05-17 Darin Adler <darin@eazel.com>
+
+ * configure.in:
+ * nautilus.spec.in:
+ Don't require ammonite any more in the default Nautilus RPM. I
+ left the ability to compile ammonite support in for now. That can
+ be removed at any time, but it doesn't hurt anybody.
+
+ * libnautilus-private/nautilus-global-preferences.c: Change default
+ web search to use google instead of the defunct Eazel search page.
+
2001-05-16 Darin Adler <darin@eazel.com>
* configure.in: Up version to 1.0.3.1 so we don't confuse cvs
diff --git a/configure.in b/configure.in
index 4d19dced8..df15d7abc 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,6 @@ dnl it too, or it will never make it into the spec file!
dnl
dnl ==========================================================================
-AMMONITE_REQUIRED=1.0.2
BONOBO_REQUIRED=0.37
CONTROL_CENTER_REQUIRED=1.3
EEL_REQUIRED=1.0
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index ea9f38add..e2d7149da 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -474,7 +474,7 @@ static const PreferenceDefault preference_defaults[] = {
{ NAUTILUS_PREFERENCES_SEARCH_WEB_URI,
PREFERENCE_STRING,
EEL_USER_LEVEL_INTERMEDIATE,
- { EEL_USER_LEVEL_NOVICE, "http://www.eazel.com/websearch" },
+ { EEL_USER_LEVEL_NOVICE, "http://www.google.com" },
{ USER_LEVEL_NONE }
},
{ NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
diff --git a/nautilus.spec.in b/nautilus.spec.in
index 187021d5d..5ff493200 100644
--- a/nautilus.spec.in
+++ b/nautilus.spec.in
@@ -35,7 +35,6 @@ Requires: libpng
Requires: control-center >= @CONTROL_CENTER_REQUIRED@
Requires: librsvg >= @LIBRSVG_REQUIRED@
Requires: eel >= @EEL_REQUIRED@
-Requires: ammonite >= @AMMONITE_REQUIRED@
BuildRequires: glib-devel >= @GLIB_REQUIRED@
BuildRequires: gtk+-devel >= @GTK_REQUIRED@