Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/hint32 into lp:ubuntuone-client

  1. hint32
  2. Merge into trunk
Proposed by dobey on 2012-03-28
Status: Merged
Approved by: dobey on 2012-03-29
Approved revision: 1215
Merged at revision: 1219
Proposed branch: lp:~dobey/ubuntuone-client/hint32
Merge into: lp:ubuntuone-client
Diff against target: 60 lines (+7/-7)
2 files modified
tests/platform/linux/test_notification.py (+6/-6)
ubuntuone/platform/linux/notification.py (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/hint32
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) 2012-03-28 Approve on 2012-03-29
Natalia Bidart 2012-03-28 Approve on 2012-03-28
Review via email: mp+99824@code.launchpad.net

Commit Message

Use set_hint_int32 for the boolean transient hint instead of set_hint

To post a comment you must log in.
Natalia Bidart (nataliabidart) wrote :

Looks great!

review: Approve
Eric Casteleijn (thisfred) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/platform/linux/test_notification.py'
2--- tests/platform/linux/test_notification.py 2012-03-09 19:27:03 +0000
3+++ tests/platform/linux/test_notification.py 2012-03-28 21:19:20 +0000
4@@ -73,7 +73,7 @@
5 self._set_up_mock_notify(FAKE_TITLE, FAKE_MESSAGE, ICON_NAME)
6 mock_notification = self.mocker.mock()
7 self.mocker.result(mock_notification)
8- mock_notification.set_hint('transient', True)
9+ mock_notification.set_hint_int32('transient', int(True))
10 mock_notification.show()
11 self.mocker.replay()
12 Notification(FAKE_APP_NAME).send_notification(FAKE_TITLE, FAKE_MESSAGE)
13@@ -83,11 +83,11 @@
14 self._set_up_mock_notify(FAKE_TITLE, FAKE_MESSAGE, ICON_NAME)
15 mock_notification = self.mocker.mock()
16 self.mocker.result(mock_notification)
17- mock_notification.set_hint('transient', True)
18+ mock_notification.set_hint_int32('transient', int(True))
19 mock_notification.show()
20 mock_notification.update(
21 FAKE_TITLE + '2', FAKE_MESSAGE + '2', ICON_NAME)
22- mock_notification.set_hint('transient', True)
23+ mock_notification.set_hint_int32('transient', int(True))
24 mock_notification.show()
25 self.mocker.replay()
26 notifier = Notification(FAKE_APP_NAME)
27@@ -99,7 +99,7 @@
28 self._set_up_mock_notify(FAKE_TITLE, FAKE_MESSAGE, FAKE_ICON)
29 mock_notification = self.mocker.mock()
30 self.mocker.result(mock_notification)
31- mock_notification.set_hint('transient', True)
32+ mock_notification.set_hint_int32('transient', int(True))
33 mock_notification.show()
34 self.mocker.replay()
35 Notification(FAKE_APP_NAME).send_notification(
36@@ -111,11 +111,11 @@
37 mock_notification = self.mocker.mock()
38 self.mocker.result(mock_notification)
39 mock_notification.set_hint_string('x-canonical-append', '')
40- mock_notification.set_hint('transient', True)
41+ mock_notification.set_hint_int32('transient', int(True))
42 mock_notification.show()
43 mock_notification.update(FAKE_TITLE, FAKE_APPENDAGE, ICON_NAME)
44 mock_notification.set_hint_string('x-canonical-append', '')
45- mock_notification.set_hint('transient', True)
46+ mock_notification.set_hint_int32('transient', int(True))
47 mock_notification.show()
48 self.mocker.replay()
49 notifier = Notification(FAKE_APP_NAME)
50
51=== modified file 'ubuntuone/platform/linux/notification.py'
52--- ubuntuone/platform/linux/notification.py 2012-03-09 19:27:03 +0000
53+++ ubuntuone/platform/linux/notification.py 2012-03-28 21:19:20 +0000
54@@ -72,5 +72,5 @@
55 if append:
56 self.notification.set_hint_string('x-canonical-append', '')
57
58- self.notification.set_hint('transient', True)
59+ self.notification.set_hint_int32('transient', int(True))
60 self.notification.show()

Subscribers

People subscribed via source and target branches