Merge lp:~agateau/amarok/appmenu-fix into lp:~kubuntu-packagers/kubuntu-packaging/amarok

[Aurélien Gâteau]

When running Amarok with the appmenu Plasma widget, make sure going to "Internet > Magnatune" or any other service does not replace the menubar with a weird one-entry menubar.

[Felix Geyer (debfx)]

Looks good!
I manually merged it as the bzr branches are somehow not compatible.

review: Approve

=== added file 'debian/patches/kubuntu/12_appmenu_fix.diff'
--- debian/patches/kubuntu/12_appmenu_fix.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu/12_appmenu_fix.diff	2010-09-14 15:39:46 +0000
@@ -0,0 +1,14 @@
+Prevent the appmenu menubar from being replaced by a strange single entry
+menubar when browsing Internet services.
+Index: amarok-2.3.1/src/services/ServiceBase.cpp
+===================================================================
+--- amarok-2.3.1.orig/src/services/ServiceBase.cpp	2010-09-14 17:19:40.000000000 +0200
++++ amarok-2.3.1/src/services/ServiceBase.cpp	2010-09-14 17:20:05.000000000 +0200
+@@ -140,6 +140,7 @@
+     m_filterModel->setFilterCaseSensitivity( Qt::CaseInsensitive );
+ 
+     m_menubar = new KMenuBar( m_topPanel );
++    m_menubar->setNativeMenuBar( false );
+     m_filterMenu = m_menubar->addMenu( i18n( "Group By" ) );
+ 
+     m_menubar->hide();

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-26 14:51:10 +0000
+++ debian/patches/series	2010-09-14 15:39:46 +0000
@@ -5,3 +5,4 @@
 kubuntu/08_fix_handbook_install_location.diff
 kubuntu/10_soundmenu_support.diff
 kubuntu/11_soundmenu_mpris2.0.diff
+kubuntu/12_appmenu_fix.diff