Merge branch 'cosmetics'

Conflicts:
	CHANGES
	Source/GDBpConnection.m

diff --cc CHANGES
index 8e81857b2d0457f416bc5425227e48e82d569dca,065e88e12ba3da096073dd92a8195191ab5ecc49..6aca4c4da79577a5e936428787c9eb07eeb44472
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -10,8 -10,7 +10,9 @@@ MacGDB
  retained
  - Fix: #160  The code pane could be unpopulated after the debugging the same
  script a subsequent time
 +- Fix: #163  Breakpoints with a space in the pathname would not be set
 +- Fix: Code would not display if the pathname to the file contained a space
+ - Fix: After using the run command, the stack will now be properly updated
  
  
  1.2.1

diff --cc Source/GDBpConnection.m
index 45e8e92e32eaf83d1adeda41ae3a111c35102412,eb1a61274a47b8212d09590ec253161cbc026211..58fdf34c1b6caf79b7458f1000a4af0cc8f2d455
--- 1/Source/GDBpConnection.m
--- 2/Source/GDBpConnection.m
+++ b/Source/GDBpConnection.m
@@@ -242,14 -256,16 +256,14 @@@ NSString* kErrorOccurredNotif = @"GDBpC
  /**
   * Send an add breakpoint command
   */
- - (void)addBreakpoint:(Breakpoint *)bp
+ - (void)addBreakpoint:(Breakpoint*)bp
  {
        if (!connected)
 -      {
                return;
 -      }
        
-       NSString *cmd = [self createCommand:[NSString stringWithFormat:@"breakpoint_set -t line -f '%@' -n %i", [bp transformedPath], [bp line]]];
 -      NSString* cmd = [self createCommand:[NSString stringWithFormat:@"breakpoint_set -t line -f %@ -n %i", [bp transformedPath], [bp line]]];
++      NSString* cmd = [self createCommand:[NSString stringWithFormat:@"breakpoint_set -t line -f '%@' -n %i", [bp transformedPath], [bp line]]];
        [socket send:cmd];
-       NSXMLDocument *info = [self processData:[socket receive]];
+       NSXMLDocument* info = [self processData:[socket receive]];
        [bp setDebuggerId:[[[[info rootElement] attributeForName:@"id"] stringValue] intValue]];
  }
  
@@@ -278,13 -294,9 +292,13 @@@
        // collect varargs
        va_list argList;
        va_start(argList, cmd);
-       NSString *format = [[NSString alloc] initWithFormat:cmd arguments:argList]; // format the command
+       NSString* format = [[NSString alloc] initWithFormat:cmd arguments:argList]; // format the command
        va_end(argList);
        
 +#ifdef BLU_DEBUG
 +      NSLog(@"--> %@", format);
 +#endif
 +      
        return [NSString stringWithFormat:@"%@ -i %@", [format autorelease], session];
  }
  
@@@ -352,14 -360,13 +366,18 @@@
        }
        
        // get the source
++<<<<<<< HEAD:Source/GDBpConnection.m
 +      NSString *filename = [[xmlframe attributeForName:@"filename"] stringValue];
 +      filename = [filename stringByReplacingOccurrencesOfString:@"%" withString:@"%%"]; // escape % in URL chars
++=======
+       NSString* filename = [[xmlframe attributeForName:@"filename"] stringValue];
++>>>>>>> cosmetics:Source/GDBpConnection.m
        [socket send:[self createCommand:[NSString stringWithFormat:@"source -f %@", filename]]];
-       NSString *source = [[[self processData:[socket receive]] rootElement] value]; // decode base64
+       NSString* source = [[[self processData:[socket receive]] rootElement] value]; // decode base64
        
        // create stack frame
-       StackFrame *frame = [[StackFrame alloc]
-               initWithIndex:0
+       StackFrame* frame = [[StackFrame alloc]
+               initWithIndex:stackDepth
                withFilename:filename
                withSource:source
                atLine:[[[xmlframe attributeForName:@"lineno"] stringValue] intValue]