Add call to nautilus_directory_async_state_changed.

2000-09-08  Gene Z. Ragan  <gzr@eazel.com>

	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_forget_activation_uri):
	Add call to nautilus_directory_async_state_changed.

	* libnautilus-extensions/nautilus-link.c:
	(nautilus_link_set_link_uri):
	Removed private nautilus_directory_async_state_changed call.

	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
	Added middle inital to my name.

7 files changed, 45 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 2107213e0..2cba3290a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-09-08  Gene Z. Ragan  <gzr@eazel.com>
+
+	* libnautilus-extensions/nautilus-file.c:
+	(nautilus_file_forget_activation_uri):
+	Add call to nautilus_directory_async_state_changed.
+	
+	* libnautilus-extensions/nautilus-link.c:
+	(nautilus_link_set_link_uri):
+	Removed private nautilus_directory_async_state_changed call.
+	
+	* src/nautilus-window-menus.c: (help_menu_about_nautilus_callback):
+	Added middle inital to my name.
+	
 2000-09-08  Mathieu Lacage  <mathieu@eazel.com>
 
 	* components/tree/nautilus-tree-view.c: fix many bugs.
diff --git a/libnautilus-extensions/nautilus-file.c b/libnautilus-extensions/nautilus-file.c
index 6b6227a6e..bdb34f69a 100644
--- a/libnautilus-extensions/nautilus-file.c
+++ b/libnautilus-extensions/nautilus-file.c
@@ -3599,10 +3599,24 @@ nautilus_file_changed (NautilusFile *file)
 void
 nautilus_file_forget_activation_uri (NautilusFile *file)
 {
+	char *file_uri;
+	NautilusDirectory *directory;
+	
 	g_free (file->details->activation_uri);
 	file->details->activation_uri = NULL;
 
 	file->details->got_activation_uri = FALSE;
+
+	/* Inform directory that its state has changed */
+	file_uri = nautilus_file_get_uri (file);
+	if (file_uri != NULL) {
+		directory = nautilus_directory_get (file_uri);
+		if (directory != NULL) {
+			nautilus_directory_async_state_changed (directory);
+			nautilus_directory_unref (directory);
+		}
+		g_free (file_uri);
+	}
 }
 
 /**
diff --git a/libnautilus-extensions/nautilus-link.c b/libnautilus-extensions/nautilus-link.c
index da1054b94..992fb2dd7 100644
--- a/libnautilus-extensions/nautilus-link.c
+++ b/libnautilus-extensions/nautilus-link.c
@@ -27,7 +27,6 @@
 
 #include "nautilus-directory.h"
 #include "nautilus-directory-notify.h"
-#include "nautilus-directory-private.h"
 #include "nautilus-file-utilities.h"
 #include "nautilus-file.h"
 #include "nautilus-global-preferences.h"
@@ -162,9 +161,8 @@ gboolean
 nautilus_link_set_link_uri (const char *path, const char *link_uri)
 {
 	xmlDocPtr document;
-	char *uri, *file_uri;
+	char *uri;
 	NautilusFile *file;
-	NautilusDirectory *directory;
 
 	document = xmlParseFile (path);
 	if (document == NULL) {
@@ -181,14 +179,9 @@ nautilus_link_set_link_uri (const char *path, const char *link_uri)
 	file = nautilus_file_get (uri);
 	if (file != NULL) {
 		nautilus_file_forget_activation_uri (file);
-		file_uri = nautilus_file_get_uri (file);
-		directory = nautilus_directory_get (file_uri);
-		nautilus_directory_async_state_changed (directory);
-		nautilus_directory_unref (directory);		
 		nautilus_file_changed (file);
 		
 		nautilus_file_unref (file);
-		g_free (file_uri);
 	}
 	g_free (uri);
 	
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 6b6227a6e..bdb34f69a 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -3599,10 +3599,24 @@ nautilus_file_changed (NautilusFile *file)
 void
 nautilus_file_forget_activation_uri (NautilusFile *file)
 {
+	char *file_uri;
+	NautilusDirectory *directory;
+	
 	g_free (file->details->activation_uri);
 	file->details->activation_uri = NULL;
 
 	file->details->got_activation_uri = FALSE;
+
+	/* Inform directory that its state has changed */
+	file_uri = nautilus_file_get_uri (file);
+	if (file_uri != NULL) {
+		directory = nautilus_directory_get (file_uri);
+		if (directory != NULL) {
+			nautilus_directory_async_state_changed (directory);
+			nautilus_directory_unref (directory);
+		}
+		g_free (file_uri);
+	}
 }
 
 /**
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index da1054b94..992fb2dd7 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -27,7 +27,6 @@
 
 #include "nautilus-directory.h"
 #include "nautilus-directory-notify.h"
-#include "nautilus-directory-private.h"
 #include "nautilus-file-utilities.h"
 #include "nautilus-file.h"
 #include "nautilus-global-preferences.h"
@@ -162,9 +161,8 @@ gboolean
 nautilus_link_set_link_uri (const char *path, const char *link_uri)
 {
 	xmlDocPtr document;
-	char *uri, *file_uri;
+	char *uri;
 	NautilusFile *file;
-	NautilusDirectory *directory;
 
 	document = xmlParseFile (path);
 	if (document == NULL) {
@@ -181,14 +179,9 @@ nautilus_link_set_link_uri (const char *path, const char *link_uri)
 	file = nautilus_file_get (uri);
 	if (file != NULL) {
 		nautilus_file_forget_activation_uri (file);
-		file_uri = nautilus_file_get_uri (file);
-		directory = nautilus_directory_get (file_uri);
-		nautilus_directory_async_state_changed (directory);
-		nautilus_directory_unref (directory);		
 		nautilus_file_changed (file);
 		
 		nautilus_file_unref (file);
-		g_free (file_uri);
 	}
 	g_free (uri);
 	
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index b1ff9140e..d84655a05 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -630,7 +630,7 @@ help_menu_about_nautilus_callback (BonoboUIHandler *ui_handler,
 			"Eskil Heyn Olsen",
 			"Ettore Perazzoli",
 			"Robey Pointer",
-			"Gene Ragan",
+			"Gene Z. Ragan",
 			"Arlo Rose",
 			"Rebecca Schulman",
 			"Robin * Slomkowski",
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index b1ff9140e..d84655a05 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -630,7 +630,7 @@ help_menu_about_nautilus_callback (BonoboUIHandler *ui_handler,
 			"Eskil Heyn Olsen",
 			"Ettore Perazzoli",
 			"Robey Pointer",
-			"Gene Ragan",
+			"Gene Z. Ragan",
 			"Arlo Rose",
 			"Rebecca Schulman",
 			"Robin * Slomkowski",