summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog-200004149
-rw-r--r--libnautilus-extensions/nautilus-directory-background.c2
-rw-r--r--libnautilus-private/nautilus-directory-background.c2
-rw-r--r--libnautilus/nautilus-directory-background.c2
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 32dfe7bb3..aeaf39b27 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,3 +1,10 @@
+2000-04-06 Darin Adler <darin@eazel.com>
+
+ * libnautilus/nautilus-directory-background.c:
+ (nautilus_connect_background_to_directory_metadata):
+ Fixed code that was trying to disconnect the handler from the
+ new directory, not the old one.
+
2000-04-06 John Sullivan <sullivan@eazel.com>
* src/file-manager/fm-list-view.c:
@@ -349,7 +356,7 @@
2000-04-04 Andy Hertzfeld <andy@eazel.com>
- * components.services/startup/nautilus-service-startup-view.c:
+ * components/services/startup/nautilus-service-startup-view.c:
changed the account name field to e-mail address; make the submit
button initially insensitive; turned off the visibility property of
the gtk_entry objects used for passwords
diff --git a/libnautilus-extensions/nautilus-directory-background.c b/libnautilus-extensions/nautilus-directory-background.c
index 7fccfe1da..8cb19374f 100644
--- a/libnautilus-extensions/nautilus-directory-background.c
+++ b/libnautilus-extensions/nautilus-directory-background.c
@@ -138,7 +138,7 @@ nautilus_connect_background_to_directory_metadata (GtkWidget *widget,
g_assert (NAUTILUS_IS_DIRECTORY (old_directory));
gtk_signal_disconnect_by_func (GTK_OBJECT (background),
GTK_SIGNAL_FUNC (background_changed_callback),
- directory);
+ old_directory);
gtk_signal_disconnect_by_func (GTK_OBJECT (old_directory),
GTK_SIGNAL_FUNC (directory_changed_callback),
background);
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index 7fccfe1da..8cb19374f 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -138,7 +138,7 @@ nautilus_connect_background_to_directory_metadata (GtkWidget *widget,
g_assert (NAUTILUS_IS_DIRECTORY (old_directory));
gtk_signal_disconnect_by_func (GTK_OBJECT (background),
GTK_SIGNAL_FUNC (background_changed_callback),
- directory);
+ old_directory);
gtk_signal_disconnect_by_func (GTK_OBJECT (old_directory),
GTK_SIGNAL_FUNC (directory_changed_callback),
background);
diff --git a/libnautilus/nautilus-directory-background.c b/libnautilus/nautilus-directory-background.c
index 7fccfe1da..8cb19374f 100644
--- a/libnautilus/nautilus-directory-background.c
+++ b/libnautilus/nautilus-directory-background.c
@@ -138,7 +138,7 @@ nautilus_connect_background_to_directory_metadata (GtkWidget *widget,
g_assert (NAUTILUS_IS_DIRECTORY (old_directory));
gtk_signal_disconnect_by_func (GTK_OBJECT (background),
GTK_SIGNAL_FUNC (background_changed_callback),
- directory);
+ old_directory);
gtk_signal_disconnect_by_func (GTK_OBJECT (old_directory),
GTK_SIGNAL_FUNC (directory_changed_callback),
background);