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
=== modified file 'debian/changelog'
--- debian/changelog 2015-07-01 16:36:42 +0000
+++ debian/changelog 2015-07-07 09:48:00 +0000
@@ -1,3 +1,9 @@
1nuntium (1.4+15.10.20150707-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Track properly org.ofono.PushNotificationAgent (LP: #1471740)
4
5 -- Alfonso Sanchez-Beato (email Canonical) <alfonso.sanchez-beato@canonical.com> Tue, 07 Jul 2015 11:42:07 +0200
6
1nuntium (1.4+15.10.20150701.2-0ubuntu1) wily; urgency=medium7nuntium (1.4+15.10.20150701.2-0ubuntu1) wily; urgency=medium
28
3 [ Alfonso Sanchez-Beato (email Canonical) ]9 [ Alfonso Sanchez-Beato (email Canonical) ]
410
=== modified file 'ofono/modem.go'
--- ofono/modem.go 2015-07-01 16:33:07 +0000
+++ ofono/modem.go 2015-07-07 09:48:00 +0000
@@ -207,16 +207,17 @@
207}207}
208208
209func (modem *Modem) updatePushInterfaceState(interfaces dbus.Variant) {209func (modem *Modem) updatePushInterfaceState(interfaces dbus.Variant) {
210 origState := modem.pushInterfaceAvailable210 nextState := false
211 availableInterfaces := reflect.ValueOf(interfaces.Value)211 availableInterfaces := reflect.ValueOf(interfaces.Value)
212 for i := 0; i < availableInterfaces.Len(); i++ {212 for i := 0; i < availableInterfaces.Len(); i++ {
213 interfaceName := reflect.ValueOf(availableInterfaces.Index(i).Interface().(string)).String()213 interfaceName := reflect.ValueOf(availableInterfaces.Index(i).Interface().(string)).String()
214 if interfaceName == PUSH_NOTIFICATION_INTERFACE {214 if interfaceName == PUSH_NOTIFICATION_INTERFACE {
215 modem.pushInterfaceAvailable = true215 nextState = true
216 break216 break
217 }217 }
218 }218 }
219 if modem.pushInterfaceAvailable != origState {219 if modem.pushInterfaceAvailable != nextState {
220 modem.pushInterfaceAvailable = nextState
220 log.Printf("Push interface state: %t", modem.pushInterfaceAvailable)221 log.Printf("Push interface state: %t", modem.pushInterfaceAvailable)
221 if modem.pushInterfaceAvailable {222 if modem.pushInterfaceAvailable {
222 modem.PushInterfaceAvailable <- true223 modem.PushInterfaceAvailable <- true

Subscribers

People subscribed via source and target branches