Change libprofiler location.

2002-01-21  Anders Carlsson  <andersca@gnu.org>

	* configure.in:
	Change libprofiler location.

	* libnautilus-private/nautilus-directory-async.c:
	(lacks_link_info), (make_dot_directory_uri), (link_info_start):
	Remove support for gmc style links.

	* libnautilus-private/nautilus-entry.c:
	(emacs_shortcuts_preference_changed_callback),
	(nautilus_entry_init), (nautilus_entry_finalize),
	(nautilus_entry_key_press), (select_all_at_idle),
	(nautilus_entry_select_all_at_idle):
	Use gtk_idle_add instead and store the idle id in the details
	struct. This fixes some weirdness in the file properties dialog,
	since the "destroy" signal can be emitted more than once.

	* libnautilus-private/nautilus-icon-canvas-item.c:
	(update_label_layouts):
	Enable underlining.

	* libnautilus-private/nautilus-monitor.c: (get_event_uri):
	Silently return if we can't find the base path. This is valid when
	we've called nautilus_monitor_cancel but still have some events
	in the queue.

1 files changed, 8 insertions, 1 deletions

diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index 6d679005d..3545a4c13 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -110,7 +110,14 @@ get_event_uri (const FAMEvent *event)
 	 */
 	base_path = g_hash_table_lookup (get_request_hash_table (),
 					 GINT_TO_POINTER (FAMREQUEST_GETREQNUM (&event->fr)));
-	g_return_val_if_fail (base_path != NULL, NULL);
+
+	/* base_path can be NULL if we've cancelled the monitor but still have
+	 * some change notifications in our queue. Just return NULL In that case.
+	 */
+	if (base_path == NULL) {
+		return NULL;
+	}
+
 	path = g_concat_dir_and_file (base_path, event->filename);
 	uri = gnome_vfs_get_uri_from_local_path (path);
 	g_free (path);