From c19d414695a660b3ffaca0e118e3232492bbc8f1 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Thu, 22 Jul 2004 22:22:37 +0000
Subject: 	* library/tkfbox.tcl (::tk::dialog::file::Update): use
 -directory 	[pwd] (instead of .) to get around some VFS edge case bugs. 
 Correct args passes to tk_messageBox when failing to cd. 	Add -force
 back to namespace import of msgcat.

---
 ChangeLog          | 17 ++++++++++++-----
 library/tkfbox.tcl | 13 +++++++------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4167ff3..4f68deb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-22  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* library/tkfbox.tcl (::tk::dialog::file::Update): use -directory
+	[pwd] (instead of .) to get around some VFS edge case bugs.
+	Correct args passes to tk_messageBox when failing to cd.
+	Add -force back to namespace import of msgcat.
+
 2004-07-20  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* generic/tkEvent.c (InvokeInputMethods): ensure IC focus is set
@@ -35,11 +42,11 @@
 
 2004-07-14  Jim Ingham  <jingham@apple.com>
 
-        * macosx/tkMacOSXCursor.c (TkpSetCursor): The code to not
-        reset the cursor more often than necessary was getting fooled
-        when the current cursor was nulled out when the current cursor
-        gets freed.  So in the case where the input cursor was NULL, we
-        have to just always set it. [Bug #894550]
+	* macosx/tkMacOSXCursor.c (TkpSetCursor): The code to not
+	reset the cursor more often than necessary was getting fooled
+	when the current cursor was nulled out when the current cursor
+	gets freed.  So in the case where the input cursor was NULL, we
+	have to just always set it. [Bug #894550]
 
 2004-07-13  Don Porter  <dgp@users.sourceforge.net>
 
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index ada21b8..fff9cb3 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -11,7 +11,7 @@
 #	files by clicking on the file icons or by entering a filename
 #	in the "Filename:" entry.
 #
-# RCS: @(#) $Id: tkfbox.tcl,v 1.43 2004/07/15 00:05:54 dgp Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.44 2004/07/22 22:22:39 hobbs Exp $
 #
 # Copyright (c) 1994-1998 Sun Microsystems, Inc.
 #
@@ -773,7 +773,7 @@ proc ::tk::IconList_Reset {w} {
 
 namespace eval ::tk::dialog {}
 namespace eval ::tk::dialog::file {
-    namespace import ::tk::msgcat::*
+    namespace import -force ::tk::msgcat::*
 }
 
 # ::tk::dialog::file:: --
@@ -1229,7 +1229,7 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
 	# should have been checked before ::tk::dialog::file::Update is called, so
 	# we normally won't come to here. Anyways, give an error and abort
 	# action.
-	tk_messageBox -type ok -parent $w -message -icon warning \
+	tk_messageBox -type ok -parent $w -icon warning -message \
 	    [mc "Cannot change to the directory \"%1\$s\".\nPermission denied." $data(selectPath)]
 	cd $appPWD
 	return
@@ -1247,9 +1247,9 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
     ::tk::IconList_DeleteAll $data(icons)
 
     # Make the dir list
-    #
+    # Using -directory [pwd] is better in some VFS cases.
     set dirs [lsort -dictionary -unique \
-		     [glob -tails -directory . -type d -nocomplain .* *]]
+		  [glob -tails -directory [pwd] -type d -nocomplain .* *]]
     set dirList {}
     foreach d $dirs {
 	if {$d eq "." || $d eq ".."} {
@@ -1263,7 +1263,8 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
 	# Make the file list if this is a File Dialog, selecting all
 	# but 'd'irectory type files.
 	#
-	set cmd [list glob -tails -directory . -type {f b c l p s} -nocomplain]
+	set cmd [list glob -tails -directory [pwd] \
+		     -type {f b c l p s} -nocomplain]
 	if {[string equal $data(filter) *]} {
 	    lappend cmd .* *
 	} else {
-- 
cgit v0.12