Merge lp:~alfonsosanchezbeato/nuntium/lp1471740 into lp:nuntium/packaging

Proposed by Alfonso Sanchez-Beato on 2015-07-07
Status: Merged
Approved by: Manuel de la Peña on 2015-07-07
Approved revision: 103
Merged at revision: 103
Proposed branch: lp:~alfonsosanchezbeato/nuntium/lp1471740
Merge into: lp:nuntium/packaging
Diff against target: 38 lines (+10/-3)
2 files modified
debian/changelog (+6/-0)
ofono/modem.go (+4/-3)
To merge this branch: bzr merge lp:~alfonsosanchezbeato/nuntium/lp1471740
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve on 2015-07-07
Alfonso Sanchez-Beato Approve on 2015-07-07
Review via email: mp+264014@code.launchpad.net

Commit message

Track properly org.ofono.PushNotificationAgent (LP: #1471740)

Description of the change

Track properly org.ofono.PushNotificationAgent (LP: #1471740)

To post a comment you must log in.
Manuel de la Peña (mandel) wrote :

Looks good as per review in github.

review: Approve
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-07-01 16:36:42 +0000
3+++ debian/changelog 2015-07-07 09:48:00 +0000
4@@ -1,3 +1,9 @@
5+nuntium (1.4+15.10.20150707-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Track properly org.ofono.PushNotificationAgent (LP: #1471740)
8+
9+ -- Alfonso Sanchez-Beato (email Canonical) <alfonso.sanchez-beato@canonical.com> Tue, 07 Jul 2015 11:42:07 +0200
10+
11 nuntium (1.4+15.10.20150701.2-0ubuntu1) wily; urgency=medium
12
13 [ Alfonso Sanchez-Beato (email Canonical) ]
14
15=== modified file 'ofono/modem.go'
16--- ofono/modem.go 2015-07-01 16:33:07 +0000
17+++ ofono/modem.go 2015-07-07 09:48:00 +0000
18@@ -207,16 +207,17 @@
19 }
20
21 func (modem *Modem) updatePushInterfaceState(interfaces dbus.Variant) {
22- origState := modem.pushInterfaceAvailable
23+ nextState := false
24 availableInterfaces := reflect.ValueOf(interfaces.Value)
25 for i := 0; i < availableInterfaces.Len(); i++ {
26 interfaceName := reflect.ValueOf(availableInterfaces.Index(i).Interface().(string)).String()
27 if interfaceName == PUSH_NOTIFICATION_INTERFACE {
28- modem.pushInterfaceAvailable = true
29+ nextState = true
30 break
31 }
32 }
33- if modem.pushInterfaceAvailable != origState {
34+ if modem.pushInterfaceAvailable != nextState {
35+ modem.pushInterfaceAvailable = nextState
36 log.Printf("Push interface state: %t", modem.pushInterfaceAvailable)
37 if modem.pushInterfaceAvailable {
38 modem.PushInterfaceAvailable <- true

Subscribers

People subscribed via source and target branches