[amarok] Fix the onlinedoc patch.

[Kevin Kofler]

commit 5c917b00cdfc0e294cc4c532b2feacf8bed1259c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Jan 29 07:47:52 2012 +0100

    Fix the onlinedoc patch.

 amarok-2.5.0-onlinedoc.patch |   50 +++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 12 deletions(-)
---
diff --git a/amarok-2.5.0-onlinedoc.patch b/amarok-2.5.0-onlinedoc.patch
index d42db67..74dae36 100644
--- a/amarok-2.5.0-onlinedoc.patch
+++ b/amarok-2.5.0-onlinedoc.patch
@@ -1,6 +1,6 @@
 diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionClasses.cpp
 --- amarok-2.5.0/src/ActionClasses.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0-onlinedoc/src/ActionClasses.cpp	2012-01-28 08:01:44.000000000 +0100
++++ amarok-2.5.0-onlinedoc/src/ActionClasses.cpp	2012-01-29 07:43:56.000000000 +0100
 @@ -31,10 +31,12 @@
  #include "playlist/PlaylistActions.h"
  #include "playlist/PlaylistModelStack.h"
@@ -14,7 +14,15 @@ diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionCla
  #include <Osd.h>
  #include <EqualizerDialog.h>
  
-@@ -152,6 +154,17 @@
+@@ -63,6 +65,7 @@
+ using namespace Amarok;
+ 
+ KHelpMenu *Menu::s_helpMenu = 0;
++OnlineHelpHandler *Menu::s_onlineHelpHandler = 0;
+ 
+ static void
+ safePlug( KActionCollection *ac, const char *name, QWidget *w )
+@@ -152,6 +155,20 @@
  
      KMenu* menu = s_helpMenu->menu();
  
@@ -23,21 +31,24 @@ diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionCla
 +        QAction *contentsAction = s_helpMenu->action( KHelpMenu::menuHelpContents );
 +        // disconnect the default slot which fires up KHelpCenter
 +        disconnect( contentsAction, SIGNAL(triggered(bool)), s_helpMenu, SLOT(appHelpActivated()) );
-+        // ensure no duplicate connection
-+        disconnect( contentsAction, SIGNAL(triggered(bool)), this, SLOT(onlineHelpActivated()) );
++        if ( s_onlineHelpHandler == 0 )
++            s_onlineHelpHandler = new OnlineHelpHandler( parent );
++        else
++            // ensure no duplicate connection
++            disconnect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
 +        // connect our custom slot which fires up a browser on UserBase instead
-+        connect( contentsAction, SIGNAL(triggered(bool)), this, SLOT(onlineHelpActivated()) );
++        connect( contentsAction, SIGNAL(triggered(bool)), s_onlineHelpHandler, SLOT(onlineHelpActivated()) );
 +    }
 +
      // NOTE: We hide "Report Bug..." because we need to add it on our own to name the dialog
      // so it can be blacklisted from LikeBack.
      s_helpMenu->action( KHelpMenu::menuReportBug )->setVisible( false );
-@@ -164,6 +177,12 @@
+@@ -164,6 +181,12 @@
      return menu;
  }
  
 +void
-+Menu::onlineHelpActivated()
++OnlineHelpHandler::onlineHelpActivated()
 +{
 +    KToolInvocation::invokeBrowser( "http://userbase.kde.org/Amarok/Manual" );
 +}
@@ -47,14 +58,29 @@ diff -ur amarok-2.5.0/src/ActionClasses.cpp amarok-2.5.0-onlinedoc/src/ActionCla
  //////////////////////////////////////////////////////////////////////////////////////////
 diff -ur amarok-2.5.0/src/ActionClasses.h amarok-2.5.0-onlinedoc/src/ActionClasses.h
 --- amarok-2.5.0/src/ActionClasses.h	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0-onlinedoc/src/ActionClasses.h	2012-01-28 07:55:40.000000000 +0100
-@@ -42,6 +42,9 @@
-             static Menu *instance();
-             static KMenu *helpMenu( QWidget *parent = 0 );
++++ amarok-2.5.0-onlinedoc/src/ActionClasses.h	2012-01-29 07:34:57.000000000 +0100
+@@ -34,6 +34,16 @@
  
-+        private slots:
+ namespace Amarok
+ {
++    class OnlineHelpHandler : public QObject
++    {
++        Q_OBJECT
++        public:
++            OnlineHelpHandler( QObject* parent );
++
++        public slots:
 +            void onlineHelpActivated();
++    }
 +
+     class Menu : public KMenu
+     {
+         Q_OBJECT
+@@ -45,6 +55,7 @@
          private:
              static Menu       *s_instance;
              static KHelpMenu  *s_helpMenu;
++            static OnlineHelpHandler *s_onlineHelpHandler;
+     };
+ 
+     class MenuAction : public KAction