The Sound Menu

Merge lp:~3v1n0/indicator-sound/mpris2-commands-reenable into lp:indicator-sound/13.10

  1. mpris2-commands-reenable
  2. Merge into trunk.13.10
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 349
Merged at revision: 348
Proposed branch: lp:~3v1n0/indicator-sound/mpris2-commands-reenable
Merge into: lp:indicator-sound/13.10
Diff against target: 80 lines (+9/-7)
4 files modified
src/common-defs.h (+3/-2)
src/transport-menu-item.vala (+1/-1)
src/transport-widget.c (+4/-4)
vapi/common-defs.vapi (+1/-0)
To merge this branch: bzr merge lp:~3v1n0/indicator-sound/mpris2-commands-reenable
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mathieu Trudel-Lapierre Approve
Review via email: mp+158410@code.launchpad.net

Commit message

TransportMenuitem: ignore events not coming from transport-menu-items.

Fix not working MPRIS commands.

Description of the change

Don't ignore the DBusMenuItem events coming from Transport menu-items.

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-raring-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-raring-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-sound-ci/18/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/common-defs.h'
2--- src/common-defs.h 2011-08-10 12:51:49 +0000
3+++ src/common-defs.h 2013-04-11 16:01:42 +0000
4@@ -64,8 +64,9 @@
5 #define DBUSMENU_MUTE_MENUITEM_TYPE "x-canonical-sound-menu-mute-type"
6 #define DBUSMENU_MUTE_MENUITEM_VALUE "x-canonical-sound-menu-mute-value"
7
8-#define DBUSMENU_TRANSPORT_MENUITEM_TYPE "x-canonical-sound-menu-player-transport-type"
9-#define DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE "x-canonical-sound-menu-player-transport-state"
10+#define DBUSMENU_TRANSPORT_MENUITEM_TYPE "x-canonical-sound-menu-player-transport-type"
11+#define DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE "x-canonical-sound-menu-player-transport-state"
12+#define DBUSMENU_TRANSPORT_MENUITEM_STATE_CHANGE "Transport state change"
13
14 #define DBUSMENU_TRACK_SPECIFIC_MENUITEM_TYPE "x-canonical-sound-menu-player-track-specific-type"
15
16
17=== modified file 'src/transport-menu-item.vala'
18--- src/transport-menu-item.vala 2013-03-30 18:25:21 +0000
19+++ src/transport-menu-item.vala 2013-04-11 16:01:42 +0000
20@@ -70,7 +70,7 @@
21 Variant input_value,
22 uint timestamp)
23 {
24- if (name != Dbusmenu.MENUITEM_EVENT_ACTIVATED)
25+ if (name != DbusmenuTransport.MENUITEM_STATE_CHANGE)
26 return;
27
28 Variant v = input_value;
29
30=== modified file 'src/transport-widget.c'
31--- src/transport-widget.c 2013-02-21 19:14:07 +0000
32+++ src/transport-widget.c 2013-04-11 16:01:42 +0000
33@@ -450,7 +450,7 @@
34 new_transport_state = g_variant_new_int32 ((int)TRANSPORT_ACTION_FORWIND);
35
36 dbusmenu_menuitem_handle_event ( priv->twin_item,
37- "Transport state change",
38+ DBUSMENU_TRANSPORT_MENUITEM_STATE_CHANGE,
39 new_transport_state,
40 0 );
41
42@@ -460,7 +460,7 @@
43 new_transport_state = g_variant_new_int32 ((int)TRANSPORT_ACTION_REWIND);
44
45 dbusmenu_menuitem_handle_event ( priv->twin_item,
46- "Transport state change",
47+ DBUSMENU_TRANSPORT_MENUITEM_STATE_CHANGE,
48 new_transport_state,
49 0 );
50 }
51@@ -482,7 +482,7 @@
52 priv->skip_frequency == 0){
53 GVariant* new_transport_state = g_variant_new_int32 ((int)result);
54 dbusmenu_menuitem_handle_event ( priv->twin_item,
55- "Transport state change",
56+ DBUSMENU_TRANSPORT_MENUITEM_STATE_CHANGE,
57 new_transport_state,
58 0 );
59 }
60@@ -533,7 +533,7 @@
61 GVariant* new_transport_event = g_variant_new_int32((int)transport_event);
62 if (priv->skip_frequency == 0){
63 dbusmenu_menuitem_handle_event ( priv->twin_item,
64- "Transport state change",
65+ DBUSMENU_TRANSPORT_MENUITEM_STATE_CHANGE,
66 new_transport_event,
67 0 );
68 }
69
70=== modified file 'vapi/common-defs.vapi'
71--- vapi/common-defs.vapi 2011-06-21 09:04:29 +0000
72+++ vapi/common-defs.vapi 2013-04-11 16:01:42 +0000
73@@ -34,6 +34,7 @@
74 namespace DbusmenuTransport{
75 public const string MENUITEM_TYPE;
76 public const string MENUITEM_PLAY_STATE;
77+ public const string MENUITEM_STATE_CHANGE;
78 }
79
80 [CCode (cheader_filename = "common-defs.h")]

Subscribers

People subscribed via source and target branches