Merge branch 'master' of https://github.com/sobjornstad/anki

aqt/browser.py

@@ -513,9 +513,6 @@ class Browser(QMainWindow):
                      self.onSearch)
         self.form.searchEdit.setCompleter(None)
         self.form.searchEdit.addItems(self.mw.pm.profile['searchHistory'])
-        self.connect(self.form.searchEdit.lineEdit(),
-                     SIGNAL("returnPressed()"),
-                     self.onSearch)
 
     def onSearch(self, reset=True):
         "Careful: if reset is true, the current note is saved."

aqt/profiles.py

@@ -223,7 +223,8 @@ and no other programs are accessing your profile folders, then try again."""))
             if os.path.exists(p):
                 return p
             else:
-                return os.path.expanduser("~/Documents/Anki")
+                loc = QDesktopServices.storageLocation(QDesktopServices.DocumentsLocation)
+                return os.path.join(loc, "Anki")
 
     def _loadMeta(self):
         path = os.path.join(self.base, "prefs.db")