From 119afd3fc763f1dabb5113df5515c1fad720f86e Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sun, 21 Jun 2009 12:24:46 -0400
Subject: [PATCH] Preferences sub menu does not have a sub menu of it's own.
 Wrong action was assigned.

---
 src/calibre/gui2/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index e0596c50dd..c7342079e5 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -315,7 +315,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                 SIGNAL('triggered(bool)'), self.convert_single)
         self.convert_menu = cm
         pm = QMenu()
-        pm.addAction(self.action_preferences)
+        pm.addAction(self.preferences_action)
         pm.addAction(_('Run welcome wizard'))
         self.connect(pm.actions()[1], SIGNAL('triggered(bool)'),
                 self.run_wizard)
@@ -515,6 +515,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
         pass
 
     def system_tray_icon_activated(self, r):
+        print r
         if r == QSystemTrayIcon.Trigger:
             if self.isVisible():
                 self.hide_windows()