Bug 263330

Summary: trayicon menu: quit not the last option if you play a song
Product: [Applications] amarok Reporter: Javier Llorente <javier>
Component: generalAssignee: Amarok Developers <amarok-bugs-dist>
Status: RESOLVED FIXED    
Severity: normal CC: javier
Priority: NOR    
Version: 2.4.0   
Target Milestone: 2.4.1   
Platform: OpenSUSE   
OS: Linux   
Latest Commit: Version Fixed In: 2.4.1
Attachments: tray icon menu after playing a song

Description Javier Llorente 2011-01-16 17:09:58 UTC
Created attachment 56096 [details]
tray icon menu after playing a song

Version:           2.4.0 (using KDE 4.5.5) 
OS:                Linux



Reproducible: Always

Steps to Reproduce:
1. Run Amarok
2. Right click on Amarok's trayicon. Everything looks OK.
3. Play a song
4. Right click again on the trayicon

Actual Results:  
"Configure Amarok" is the last option

Expected Results:  
"Quit" should be the last one
Comment 1 Javier Llorente 2011-01-16 17:13:12 UTC
Please see attached screenshot ;-)
This happens on openSUSE 11.3 (64 bit), with KDE 4.5.5 and Qt 4.6.3
Comment 2 Javier Llorente 2011-01-16 18:29:22 UTC
It also affects Amarok 2.4.0 on KDE 4.5.95/Qt 4.7.1
Comment 3 Sergey Ivanov 2011-01-16 19:22:06 UTC
commit bf2d34aff5b343a331eca52b60fd9edb74d8ebfe
branch master
Author: Sergey Ivanov <123kash@gmail.com>
Date:   Sun Jan 16 21:21:27 2011 +0300

    Fixed wrong "Configure amarok" action position in tray icon popup menu.
    BUG: 263330

diff --git a/ChangeLog b/ChangeLog
index 9147c4e..7736b92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ VERSION 2.4.1
       <bhargav.1191@gmail.com>. (BR 248690)
 
   BUGFIXES:
+    * Fixed wrong "Configure amarok" action position in tray icon popup menu. (BR 263330)
     * Fixed minor inconsistency in the Collection view. Patch by 
       Bhargav Mangipudi <bhargav.1191@gmail.com>. (BR 260973)
     * Fixed potential crash with the Similar Artists applet. Thanks to 
diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp
index f9cb8d7..768424e 100644
--- a/src/TrayIcon.cpp
+++ b/src/TrayIcon.cpp
@@ -296,9 +296,9 @@ Amarok::TrayIcon::updateMenu()
 
         m_separator = contextMenu()->addSeparator();
         // readd
+        contextMenu()->addAction( preferenceAction );
         contextMenu()->addAction( actionCollection()->action( "minimizeRestore" ) );
         contextMenu()->addAction( actionCollection()->action( "file_quit" ) );
-        contextMenu()->addAction( preferenceAction );
     }
 }