← Back to branch summary

~ubuntu-branches/ubuntu/saucy/monodevelop/saucy-proposed

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2012-06-22 20:35:35 UTC
  • mfrom: (10.3.2)
  • Revision ID: package-import@ubuntu.com-20120622203535-zrozwvcf6kfk6l6i
Tags: 3.0.3.2+dfsg-1
* [3fd89ae] Imported Upstream version 3.0.3.2+dfsg
* [379a680] Remove old patches we haven't used for ages from git.
* [d71161d] Remove correct_paths_in_monodevelop-core-addins.pc.patch.
  Upstream claim to have fixed this by moving assembly install locations.
* [15dbfb9] Fix install location for MonoDevelop.Gettext.dll.config.
* [26eb434] Fix install location for MonoDevelop.SourceEditor2.dll.config.
* [4169974] Upstream commit 53282c9 which finally reconciles the 
  MonoDevelop.Gettext.dll install location with the 
  monodevelop-core-addins.pc location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
370
370
                                                        vcFound = doc.Window.ViewContent;
371
371
                                                
372
372
                                                //old method as fallback
373
 
                                                if ((vcFound == null) && (doc.FileName == uniqueName))
 
373
                                                if ((vcFound == null) && (doc.FileName == uniqueName || doc.FileName == fileName))
374
374
                                                        vcFound = doc.Window.ViewContent;
375
375
                                                //if found, select window and jump to line
376
376
                                                if (vcFound != null) {
490
490
                        workbench.ShowView (newContent, true);
491
491
                        DisplayBindingService.AttachSubWindows (newContent.WorkbenchWindow);
492
492
                        
493
 
                        return WrapDocument (newContent.WorkbenchWindow);
 
493
                        var document = WrapDocument (newContent.WorkbenchWindow);
 
494
                        document.StartReparseThread ();
 
495
                        return document;
494
496
                }
495
497
                
496
498
                public void ShowGlobalPreferencesDialog (Gtk.Window parentWindow)
695
697
                        if (IdeApp.ProjectOperations.CurrentSelectedProject != null) {
696
698
                                if (IdeApp.ProjectOperations.CurrentSelectedProject.Files.GetFile (fileName) != null)
697
699
                                        project = IdeApp.ProjectOperations.CurrentSelectedProject;
 
700
                                else if (IdeApp.ProjectOperations.CurrentSelectedProject.FileName == fileName)
 
701
                                        project = IdeApp.ProjectOperations.CurrentSelectedProject;
698
702
                        }
699
703
                        if (project == null && IdeApp.ProjectOperations.CurrentSelectedWorkspaceItem != null) {
700
704
                                project = IdeApp.ProjectOperations.CurrentSelectedWorkspaceItem.GetProjectContainingFile (fileName);