SF.net SVN: frontierkernel: [1643] Frontier/trunk/Common/source/ shellwindowverbs.c

[<cre...@us...>]

Revision: 1643
          http://svn.sourceforge.net/frontierkernel/?rev=1643&view=rev
Author:   creecode
Date:     2007-04-04 15:18:14 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
in getfileverb function use getfilespecparent to return an unextended filespec

Modified Paths:
--------------
    Frontier/trunk/Common/source/shellwindowverbs.c

Modified: Frontier/trunk/Common/source/shellwindowverbs.c
===================================================================
--- Frontier/trunk/Common/source/shellwindowverbs.c	2007-03-06 20:41:09 UTC (rev 1642)
+++ Frontier/trunk/Common/source/shellwindowverbs.c	2007-04-04 22:18:14 UTC (rev 1643)
@@ -1045,26 +1045,36 @@
 	} /*settitleverb*/
 
 
-static boolean getfileverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
+static boolean getfileverb ( hdltreenode hparam1, tyvaluerecord *vreturned ) {
+
+	//
+	// 2007-04-03 creedon: use getfilespecparent to return an unextended
+	//				   filespec
+	//
+	// 1992-06-24 dmb: get the title of the object or window indicated in
+	//			    hparam1. if it's  not an external value or a window,
+	//			    always return the empty string
+	//
 	
-	/*
-	6/24/92 dmb: get the title of the object or window indicated in hparam1.
-	if it's  not an external value or a window, always return the empty string
-	*/
-	
 	hdlwindowinfo hinfo;
 	tyfilespec fs;
 	
 	flnextparamislast = true;
 	
-	if (!getwinparam (hparam1, 1, &hinfo))
-		return (false);
+	if ( ! getwinparam ( hparam1, 1, &hinfo ) )
+		return ( false );
+		
+	if ( ( hinfo != nil ) && windowgetfspec ( ( **hinfo ).macwindow, &fs ) ) {
 	
-	if ((hinfo != nil) && windowgetfspec ((**hinfo).macwindow, &fs))
-		return (setfilespecvalue (&fs, vreturned));
+		getfilespecparent ( &fs );
+		
+		return ( setfilespecvalue ( &fs, vreturned ) );
+		
+		}
+		
+	return ( setstringvalue ( zerostring, vreturned ) );
 	
-	return (setstringvalue (zerostring, vreturned));
-	} /*getfileverb*/
+	} // getfileverb
 
 
 static boolean windowfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.