Amarok

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

  1. mpris2-raise-fix
  2. Merge into amarok
Proposed by Aurélien Gâteau on 2010-09-29
Status: Merged
Merged at revision: 70
Proposed branch: lp:~agateau/amarok/mpris2-raise-fix
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/amarok
Diff against target: 160 lines (+28/-27)
1 file modified
debian/patches/kubuntu/11_soundmenu_mpris2.0.diff (+28/-27)
To merge this branch: bzr merge lp:~agateau/amarok/mpris2-raise-fix
Reviewer Review Type Date Requested Status
Felix Geyer Approve on 2010-09-30
VCS imports 2010-09-29 Pending
Review via email: mp+36999@code.launchpad.net

Description of the Change

Make sure clicking on "Amarok" in the Sound Menu raises it, even if it has been minimized to tray.

To post a comment you must log in.
Felix Geyer (debfx) wrote :

Merged, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/kubuntu/11_soundmenu_mpris2.0.diff'
2--- debian/patches/kubuntu/11_soundmenu_mpris2.0.diff 2010-09-16 11:40:14 +0000
3+++ debian/patches/kubuntu/11_soundmenu_mpris2.0.diff 2010-09-29 14:51:46 +0000
4@@ -1,7 +1,7 @@
5-Index: amarok-2.3.1/src/App.cpp
6+Index: amarok-2.3.2/src/App.cpp
7 ===================================================================
8---- amarok-2.3.1.orig/src/App.cpp 2010-08-31 10:59:07.000000000 +0100
9-+++ amarok-2.3.1/src/App.cpp 2010-08-31 10:59:24.987569345 +0100
10+--- amarok-2.3.2.orig/src/App.cpp 2010-09-28 16:55:04.000000000 +0200
11++++ amarok-2.3.2/src/App.cpp 2010-09-28 16:55:04.000000000 +0200
12 @@ -36,6 +36,7 @@
13 #include "core/meta/support/MetaConstants.h"
14 #include "core/meta/Meta.h"
15@@ -10,7 +10,7 @@
16 #include "network/NetworkAccessManagerProxy.h"
17 #include "Osd.h"
18 #include "PlaybackConfig.h"
19-@@ -293,6 +294,7 @@
20+@@ -297,6 +298,7 @@
21 if (QDBusConnection::sessionBus().isConnected() && (dbusService = QDBusConnection::sessionBus().interface()))
22 {
23 dbusService->unregisterService("org.mpris.amarok");
24@@ -18,7 +18,7 @@
25 }
26 #endif
27 }
28-@@ -675,7 +677,9 @@
29+@@ -670,7 +672,9 @@
30 new Amarok::PlayerDBusHandler();
31 new Amarok::TracklistDBusHandler();
32 new CollectionDBusHandler( this );
33@@ -28,11 +28,11 @@
34 PERF_LOG( "Done creating DBus handlers" )
35
36 #ifdef HAVE_INDICATEQT
37-Index: amarok-2.3.1/src/CMakeLists.txt
38+Index: amarok-2.3.2/src/CMakeLists.txt
39 ===================================================================
40---- amarok-2.3.1.orig/src/CMakeLists.txt 2010-08-31 10:59:07.000000000 +0100
41-+++ amarok-2.3.1/src/CMakeLists.txt 2010-08-31 10:59:24.991569345 +0100
42-@@ -483,6 +483,7 @@
43+--- amarok-2.3.2.orig/src/CMakeLists.txt 2010-09-28 16:55:04.000000000 +0200
44++++ amarok-2.3.2/src/CMakeLists.txt 2010-09-28 16:55:04.000000000 +0200
45+@@ -486,6 +486,7 @@
46 dbus/TracklistDBusHandler.cpp
47 dbus/CollectionDBusHandler.cpp
48 dbus/DBusQueryHelper.cpp
49@@ -40,7 +40,7 @@
50 )
51
52
53-@@ -749,6 +750,8 @@
54+@@ -776,6 +777,8 @@
55 qt4_add_dbus_adaptor( amaroklib_LIB_SRCS dbus/org.freedesktop.MediaPlayer.player.xml PlayerDBusHandler.h Amarok::PlayerDBusHandler PlayerAdaptor PlayerAdaptor)
56 qt4_add_dbus_adaptor( amaroklib_LIB_SRCS dbus/org.freedesktop.MediaPlayer.tracklist.xml TracklistDBusHandler.h Amarok::TracklistDBusHandler TracklistAdaptor TracklistAdaptor)
57 qt4_add_dbus_adaptor( amaroklib_LIB_SRCS dbus/org.kde.amarok.Collection.xml CollectionDBusHandler.h CollectionDBusHandler CollectionAdaptor CollectionAdaptor)
58@@ -49,10 +49,10 @@
59
60 set( amaroklib_DEPENDS "amarokpud" )
61 set( amaroklib_DEPENDS "amarokcore" )
62-Index: amarok-2.3.1/src/core/meta/support/MetaUtility.cpp
63+Index: amarok-2.3.2/src/core/meta/support/MetaUtility.cpp
64 ===================================================================
65---- amarok-2.3.1.orig/src/core/meta/support/MetaUtility.cpp 2010-05-27 19:37:21.000000000 +0100
66-+++ amarok-2.3.1/src/core/meta/support/MetaUtility.cpp 2010-08-31 10:59:24.991569345 +0100
67+--- amarok-2.3.2.orig/src/core/meta/support/MetaUtility.cpp 2010-09-15 23:24:11.000000000 +0200
68++++ amarok-2.3.2/src/core/meta/support/MetaUtility.cpp 2010-09-28 16:55:04.000000000 +0200
69 @@ -150,6 +150,74 @@
70 return map;
71 }
72@@ -128,10 +128,10 @@
73
74 void
75 Meta::Field::updateTrack( Meta::TrackPtr track, const QVariantMap &metadata )
76-Index: amarok-2.3.1/src/core/meta/support/MetaUtility.h
77+Index: amarok-2.3.2/src/core/meta/support/MetaUtility.h
78 ===================================================================
79---- amarok-2.3.1.orig/src/core/meta/support/MetaUtility.h 2010-05-27 19:37:21.000000000 +0100
80-+++ amarok-2.3.1/src/core/meta/support/MetaUtility.h 2010-08-31 10:59:24.991569345 +0100
81+--- amarok-2.3.2.orig/src/core/meta/support/MetaUtility.h 2010-09-15 23:24:11.000000000 +0200
82++++ amarok-2.3.2/src/core/meta/support/MetaUtility.h 2010-09-28 16:55:04.000000000 +0200
83 @@ -62,8 +62,10 @@
84
85 //deprecated
86@@ -144,11 +144,11 @@
87 AMAROK_CORE_EXPORT void updateTrack( Meta::TrackPtr track, const QVariantMap &metadata );
88 AMAROK_CORE_EXPORT QString xesamPrettyToFullFieldName( const QString &name );
89 AMAROK_CORE_EXPORT QString xesamFullToPrettyFieldName( const QString &name );
90-Index: amarok-2.3.1/src/dbus/Mpris2DBusHandler.cpp
91+Index: amarok-2.3.2/src/dbus/Mpris2DBusHandler.cpp
92 ===================================================================
93 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
94-+++ amarok-2.3.1/src/dbus/Mpris2DBusHandler.cpp 2010-08-31 10:59:24.995569345 +0100
95-@@ -0,0 +1,434 @@
96++++ amarok-2.3.2/src/dbus/Mpris2DBusHandler.cpp 2010-09-28 16:55:50.000000000 +0200
97+@@ -0,0 +1,435 @@
98 +/****************************************************************************************
99 + * Copyright (c) 2008 Ian Monroe <ian@monroe.nu> *
100 + * Copyright (c) 2008 Peter ZHOU <peterzhoulei@gmail.com> *
101@@ -267,6 +267,7 @@
102 + warning() << "No window!";
103 + return;
104 + }
105++ window->show();
106 + KWindowSystem::forceActiveWindow( window->winId() );
107 + }
108 +
109@@ -583,10 +584,10 @@
110 +}
111 +
112 +#include "Mpris2DBusHandler.moc"
113-Index: amarok-2.3.1/src/dbus/Mpris2DBusHandler.h
114+Index: amarok-2.3.2/src/dbus/Mpris2DBusHandler.h
115 ===================================================================
116 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
117-+++ amarok-2.3.1/src/dbus/Mpris2DBusHandler.h 2010-08-31 10:59:24.995569345 +0100
118++++ amarok-2.3.2/src/dbus/Mpris2DBusHandler.h 2010-09-28 16:55:04.000000000 +0200
119 @@ -0,0 +1,170 @@
120 +/****************************************************************************************
121 + * Copyright (c) 2010 Canonical Ltd *
122@@ -758,10 +759,10 @@
123 +}
124 +
125 +#endif
126-Index: amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.Player.xml
127+Index: amarok-2.3.2/src/dbus/org.mpris.MediaPlayer2.Player.xml
128 ===================================================================
129 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
130-+++ amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.Player.xml 2010-08-31 10:59:24.999569345 +0100
131++++ amarok-2.3.2/src/dbus/org.mpris.MediaPlayer2.Player.xml 2010-09-28 16:55:04.000000000 +0200
132 @@ -0,0 +1,86 @@
133 +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
134 +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
135@@ -849,10 +850,10 @@
136 +
137 + </interface>
138 +</node>
139-Index: amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.root.xml
140+Index: amarok-2.3.2/src/dbus/org.mpris.MediaPlayer2.root.xml
141 ===================================================================
142 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
143-+++ amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.root.xml 2010-08-31 10:59:24.999569345 +0100
144++++ amarok-2.3.2/src/dbus/org.mpris.MediaPlayer2.root.xml 2010-09-28 16:55:04.000000000 +0200
145 @@ -0,0 +1,25 @@
146 +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
147 + "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
148@@ -879,10 +880,10 @@
149 + <property name="SupportedMimeTypes" type="as" access="read"/>
150 + </interface>
151 +</node>
152-Index: amarok-2.3.1/tests/mpristest.py
153+Index: amarok-2.3.2/tests/mpristest.py
154 ===================================================================
155 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
156-+++ amarok-2.3.1/tests/mpristest.py 2010-08-31 10:59:24.999569345 +0100
157++++ amarok-2.3.2/tests/mpristest.py 2010-09-28 16:55:04.000000000 +0200
158 @@ -0,0 +1,65 @@
159 +import subprocess
160 +import time

Subscribers

People subscribed via source and target branches