<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -830,6 +830,7 @@ void BrowserMainWindow::setupMenu()
     m_toolsMenu-&gt;addAction(m_toolsEnableInspectorAction);
 
     m_toolsSearchManagerAction = new QAction(m_toolsMenu);
+    m_toolsSearchManagerAction-&gt;setMenuRole(QAction::NoRole);
     connect(m_toolsSearchManagerAction, SIGNAL(triggered()),
             this, SLOT(showSearchDialog()));
     m_toolsMenu-&gt;addAction(m_toolsSearchManagerAction);
@@ -840,7 +841,8 @@ void BrowserMainWindow::setupMenu()
     m_toolsMenu-&gt;addAction(m_adBlockDialogAction);
 
     m_toolsMenu-&gt;addSeparator();
-    m_toolsPreferencesAction = new QAction(m_editMenu);
+    m_toolsPreferencesAction = new QAction(m_toolsMenu);
+    m_toolsPreferencesAction-&gt;setMenuRole(QAction::PreferencesRole);
     connect(m_toolsPreferencesAction, SIGNAL(triggered()),
             this, SLOT(preferences()));
     m_toolsMenu-&gt;addAction(m_toolsPreferencesAction);</diff>
      <filename>src/browsermainwindow.cpp</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e553195e165fb6def0a8381a44e760e3f94cb614</id>
    </parent>
  </parents>
  <author>
    <name>Christopher Eby</name>
    <email>kreed@kreed.org</email>
  </author>
  <url>http://github.com/faw/arora/commit/4540a44b7f47231eee1fb91ec255a14729b144f9</url>
  <id>4540a44b7f47231eee1fb91ec255a14729b144f9</id>
  <committed-date>2009-10-15T19:11:40-07:00</committed-date>
  <authored-date>2009-10-10T13:25:18-07:00</authored-date>
  <message>Show the right dialog for the Preferences action on Mac OS X

Currently the search configuration is being shown, not the settings
dialog.</message>
  <tree>53d324b96c66cdeda7483c97fb8c2cf009fbadca</tree>
  <committer>
    <name>Benjamin C Meyer</name>
    <email>ben@meyerhome.net</email>
  </committer>
</commit>
