Merge branch 'master' into good

pyfpdb/fpdb.py

@@ -678,6 +678,12 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
         pass
     
     def statusicon_activate(self, widget, data = None):
+        # Let's allow the tray icon to toggle window visibility, the way
+        # most other apps work
+        shown = self.window.get_property('visible')
+        if shown:
+            self.window.hide()
+        else:
             self.window.show()
             self.window.present()