fixed conflict

bin/keepnote

@@ -429,7 +429,6 @@ def main(argv):
     if options.cont:
         while True:
             time.sleep(1000)
-
 
 #=============================================================================
 # start main function

keepnote/extensions/notebook_http/__init__.py

@@ -101,7 +101,7 @@ def start_http(self, app, args):
         # start server in another thread
         host = "localhost"
         url = "http://%s:%d/" % (host, port)
-        server = NoteBookHttpServer(conn, port=port, host="localhost")
+        server = NoteBookHttpServer(conn, host="localhost", port=port)
 
         if port in self._ports:
             raise Exception("Server already on port %d" % port)

keepnote/gui/three_pane_viewer.py

@@ -629,15 +629,6 @@ def _view_new_node(self, node):
             self.treeview.edit_node(node)
         else:
             self.listview.edit_node(node)
-
-        #widget = self.get_focused_widget()
-        #
-        #if widget == self.treeview:
-        #    self.treeview.expand_node(node.get_parent())
-        #    self.treeview.edit_node(node)
-        #else:
-        #    self.listview.expand_node(node.get_parent())
-        #    self.listview.edit_node(node)
 
 
 
@@ -648,12 +639,8 @@ def _on_rename_node(self):
         if len(nodes) == 0:
             return
 
-        widget = self.get_focused_widget()
-
-        if widget == self.treeview:
-            self.treeview.edit_node(nodes[0])
-        else:
-            self.listview.edit_node(nodes[0])
+        widget = self.get_focused_widget(self.listview)        
+        widget.edit_node(nodes[0])
 
 
     def goto_node(self, node, direct=False):
@@ -724,7 +711,7 @@ def goto_next_node(self):
     def goto_prev_node(self):
         """Move focus to the 'previous' node"""
 
-        widget = self.get_focused_widget()
+        widget = self.get_focused_widget(self.treeview)
         path, col = widget.get_cursor()
 
         if path and path[-1] > 0:

keepnote/notebook/connection/http.py

@@ -364,7 +364,7 @@ def do_HEAD(self):
 
 class NoteBookHttpServer (BaseHTTPServer.HTTPServer):
 
-    def __init__(self, conn, prefix="/", port=8000, host=""):
+    def __init__(self, conn, prefix="/", host="", port=8000):
         self.conn = conn
         self.prefixes = [prefix]
         self.server_address = (host, port)