summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@gnu.org>2002-03-07 08:27:52 +0000
committerAnders Carlsson <andersca@src.gnome.org>2002-03-07 08:27:52 +0000
commit17170fe596541d635797cdbbff5969b7594db6f6 (patch)
treec032b95fc72960496529ce098485d1688d16e4a4
parentabf700ab0ab3084b8a9275986c638dff9f03b9d5 (diff)
downloadnautilus-17170fe596541d635797cdbbff5969b7594db6f6.tar.gz
Require eel 1.1.7
2002-03-07 Anders Carlsson <andersca@gnu.org> * configure.in: Require eel 1.1.7 * src/nautilus-preferences-dialog.c: Use EEL_PREFERENCE_ITEM_EDITABLE_PASSWORD_STRING for the proxy dialog. Fixes #69387.
-rw-r--r--ChangeLog9
-rw-r--r--configure.in2
-rw-r--r--src/nautilus-preferences-dialog.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7469c843f..359a1c110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-07 Anders Carlsson <andersca@gnu.org>
+
+ * configure.in: Require eel 1.1.7
+
+ * src/nautilus-preferences-dialog.c:
+ Use EEL_PREFERENCE_ITEM_EDITABLE_PASSWORD_STRING for
+ the proxy dialog. Fixes #69387.
+
2002-03-06 Alexander Larsson <alla@lysator.liu.se>
(merges from stable):
@@ -198,6 +206,7 @@
(nautilus_bonobo_set_label_for_menu_item_and_command): Add
g_return_if_fail.
+>>>>>>> 1.5108
2002-03-06 Anders Carlsson <andersca@gnu.org>
* libnautilus-private/nautilus-directory-async.c:
diff --git a/configure.in b/configure.in
index 0031040bf..c8f193129 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ ART_REQUIRED=2.3.6
BONOBO_ACTIVATION_REQUIRED=0.9.3
BONOBO_REQUIRED=1.110
BONOBO_UI_REQUIRED=1.110.2
-EEL_REQUIRED=1.1.6
+EEL_REQUIRED=1.1.7
ESOUND_REQUIRED=0.2.23
GLIB_REQUIRED=1.3.10
GNOME_CANVAS_REQUIRED=1.105
diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c
index b107ac197..d12573f29 100644
--- a/src/nautilus-preferences-dialog.c
+++ b/src/nautilus-preferences-dialog.c
@@ -303,7 +303,7 @@ static EelPreferencesItemDescription navigation_items[] = {
{ N_("HTTP Proxy Settings"),
NAUTILUS_PREFERENCES_HTTP_USE_AUTH_PASSWORD,
N_("Password:"),
- EEL_PREFERENCE_ITEM_EDITABLE_STRING,
+ EEL_PREFERENCE_ITEM_EDITABLE_PASSWORD_STRING,
NAUTILUS_PREFERENCES_HTTP_USE_PROXY,
EEL_PREFERENCE_ITEM_SHOW
},