From 9d2d3d5c00ef2e684dd81d7aea093cd5711b36bd Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Tue, 9 Apr 2013 15:47:06 -0600
Subject: [PATCH] Rename window methods to distinguish editor window from
 config window

---
 spec/app/window-spec.coffee | 2 +-
 src/app/window.coffee       | 6 +++---
 src/window-bootstrap.coffee | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/app/window-spec.coffee b/spec/app/window-spec.coffee
index 977d628e1..108b5ed3f 100644
--- a/spec/app/window-spec.coffee
+++ b/spec/app/window-spec.coffee
@@ -8,7 +8,7 @@ describe "Window", ->
   beforeEach ->
     spyOn(atom, 'getPathToOpen').andReturn(project.getPath())
     window.handleWindowEvents()
-    window.deserializeWindowState()
+    window.deserializeEditorWindow()
     projectPath = project.getPath()
 
   afterEach ->
diff --git a/src/app/window.coffee b/src/app/window.coffee
index 12a29a28e..71f58a493 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -35,7 +35,7 @@ window.setUpEnvironment = ->
     requireStylesheet(nativeStylesheetPath)
 
 # This method is only called when opening a real application window
-window.startup = ->
+window.startEditorWindow = ->
   directory = _.find ['/opt/boxen', '/opt/github', '/usr/local'], (dir) -> fsUtils.isDirectory(dir)
   if directory
     installAtomCommand(fsUtils.join(directory, 'bin/atom'))
@@ -48,7 +48,7 @@ window.startup = ->
   keymap.loadBundledKeymaps()
   atom.loadThemes()
   atom.loadPackages()
-  deserializeWindowState()
+  deserializeEditorWindow()
   atom.activatePackages()
   keymap.loadUserKeymaps()
   atom.requireUserInitScript()
@@ -107,7 +107,7 @@ window.onDrop = (e) ->
   for file in e.originalEvent.dataTransfer.files
     atom.open(file.path)
 
-window.deserializeWindowState = ->
+window.deserializeEditorWindow = ->
   RootView = require 'root-view'
   Project = require 'project'
   Git = require 'git'
diff --git a/src/window-bootstrap.coffee b/src/window-bootstrap.coffee
index 49eeef968..8604cdb48 100644
--- a/src/window-bootstrap.coffee
+++ b/src/window-bootstrap.coffee
@@ -4,6 +4,6 @@ require 'atom'
 require 'window'
 
 window.setUpEnvironment()
-window.startup()
+window.startEditorWindow()
 setTimeout((-> atom.show()), 0)
 console.log "Load time: #{new Date().getTime() - date}"