always show preferences window in current workspace. Fixes #2189

src/config.py

@@ -461,6 +461,7 @@ class PreferencesWindow:
 		
 		self.notebook.set_current_page(0)
 		self.window.show_all()
+		gtkgui_helpers.possibly_move_window_in_current_desktop(self.window)
 
 	def on_preferences_window_key_press_event(self, widget, event):
 		if event.keyval == gtk.keysyms.Escape:

src/gtkgui_helpers.py

@@ -406,7 +406,7 @@ def possibly_move_window_in_current_desktop(window):
 		if current_virtual_desktop_no != window_virtual_desktop:
 			# we are in another VD that the window was
 			# so show it in current VD
-			window.show()
+			window.present()
 
 def file_is_locked(path_to_file):
 	'''returns True if file is locked (WINDOWS ONLY)'''